ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
dolphin/Source/Core/VideoCommon/VertexShaderGen.cpp

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

602 lines
23 KiB
C++
Raw Normal View History

Set copyright year to when a file was created
2015-05-24 04:55:12 +00:00
// Copyright 2008 Dolphin Emulator Project
Update license headers to GPLv2+
2015-05-17 23:08:10 +00:00
// Licensed under GPLv2+
New license header introduced for DiscIO, AudioCommon, InputCommon, VideoCommon, and Common projects.
2013-04-18 03:09:55 +00:00
// Refer to the license.txt file included.
Fixup line endings.
2011-09-29 19:52:13 +00:00
VideoCommon: Remove unnecessary memset on ShaderUid instances. Zero-initialization zeroes out all members and padding bits, so this is safe to do. While we're at it, also add static assertions that enforce the necessary requirements of a UID type explicitly within the ShaderUid class. This way, we can remove several memset calls around the shader generation code that makes sure the underlying UID data is zeroed out. Now our ShaderUid class enforces this for us, so we don't need to care about it at the usage sites.
2019-05-30 05:05:06 +00:00
#include "VideoCommon/VertexShaderGen.h"
Fixup line endings.
2011-09-29 19:52:13 +00:00
VideoCommon: Header cleanup Also remedies places where the video backends and core rely on things being indirectly included.
2016-01-17 21:54:31 +00:00
#include "Common/Assert.h"
#include "Common/CommonTypes.h"
Convert all includes to relative paths.
2014-02-17 10:18:15 +00:00
#include "VideoCommon/BPMemory.h"
#include "VideoCommon/LightingShaderGen.h"
#include "VideoCommon/NativeVertexFormat.h"
VideoCommon: flush vertex manager if components change
2015-11-01 21:39:31 +00:00
#include "VideoCommon/VertexLoaderManager.h"
VideoCommon: Make API_TYPE an enum class Allows for forward declarations in most places, which prevents dumping unrelated VideoCommon.h contents directly into headers.
2016-07-21 23:04:57 +00:00
#include "VideoCommon/VideoCommon.h"
Convert all includes to relative paths.
2014-02-17 10:18:15 +00:00
#include "VideoCommon/VideoConfig.h"
ShaderGenCommon: Remove unnecessary includes
2017-02-01 15:56:13 +00:00
#include "VideoCommon/XFMemory.h"
Fixup line endings.
2011-09-29 19:52:13 +00:00
Multithreadded Shadergen: Second Pass over vertex/lighting Shadergens As much as possible, the asserts have been moved out of the GetUID function. But there are some places where asserts depend on variables that aren't stored in the shader UID.
2016-01-16 11:34:06 +00:00
VertexShaderUid GetVertexShaderUid()
Fixup line endings.
2011-09-29 19:52:13 +00:00
{
Assert: Uppercase assertion macros Macros should be all upper-cased. This is also kind of a wart that's been sticking out for quite a while now (we avoid prefixing underscores).
2018-03-15 00:34:35 +00:00
ASSERT(bpmem.genMode.numtexgens == xfmem.numTexGen.numTexGens);
ASSERT(bpmem.genMode.numcolchans == xfmem.numChan.numColorChans);
Reformat all the things. Have fun with merge conflicts.
2016-06-24 08:43:46 +00:00
VideoCommon: Remove unnecessary memset on ShaderUid instances. Zero-initialization zeroes out all members and padding bits, so this is safe to do. While we're at it, also add static assertions that enforce the necessary requirements of a UID type explicitly within the ShaderUid class. This way, we can remove several memset calls around the shader generation code that makes sure the underlying UID data is zeroed out. Now our ShaderUid class enforces this for us, so we don't need to care about it at the usage sites.
2019-05-30 05:05:06 +00:00
VertexShaderUid out;
vertex_shader_uid_data* const uid_data = out.GetUidData();
Multithreadded Shadergen: Second Pass over vertex/lighting Shadergens As much as possible, the asserts have been moved out of the GetUID function. But there are some places where asserts depend on variables that aren't stored in the shader UID.
2016-01-16 11:34:06 +00:00
uid_data->numTexGens = xfmem.numTexGen.numTexGens;
uid_data->components = VertexLoaderManager::g_current_components;
uid_data->numColorChans = xfmem.numChan.numColorChans;
GetLightingShaderUid(uid_data->lighting);
// transform texcoords
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
for (u32 i = 0; i < uid_data->numTexGens; ++i)
Multithreadded Shadergen: Second Pass over vertex/lighting Shadergens As much as possible, the asserts have been moved out of the GetUID function. But there are some places where asserts depend on variables that aren't stored in the shader UID.
2016-01-16 11:34:06 +00:00
{
auto& texinfo = uid_data->texMtxInfo[i];
texinfo.sourcerow = xfmem.texMtxInfo[i].sourcerow;
texinfo.texgentype = xfmem.texMtxInfo[i].texgentype;
texinfo.inputform = xfmem.texMtxInfo[i].inputform;
// first transformation
switch (texinfo.texgentype)
{
Convert XFMemory to BitField and enum class Additionally a new ClipDisable union has been added (though it is not currently used by Dolphin).
2021-02-11 00:01:42 +00:00
case TexGenType::EmbossMap: // calculate tex coords into bump map
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
if ((uid_data->components & (VB_HAS_NRM1 | VB_HAS_NRM2)) != 0)
Multithreadded Shadergen: Second Pass over vertex/lighting Shadergens As much as possible, the asserts have been moved out of the GetUID function. But there are some places where asserts depend on variables that aren't stored in the shader UID.
2016-01-16 11:34:06 +00:00
{
// transform the light dir into tangent space
texinfo.embosslightshift = xfmem.texMtxInfo[i].embosslightshift;
texinfo.embosssourceshift = xfmem.texMtxInfo[i].embosssourceshift;
}
else
{
texinfo.embosssourceshift = xfmem.texMtxInfo[i].embosssourceshift;
}
break;
Convert XFMemory to BitField and enum class Additionally a new ClipDisable union has been added (though it is not currently used by Dolphin).
2021-02-11 00:01:42 +00:00
case TexGenType::Color0:
case TexGenType::Color1:
Multithreadded Shadergen: Second Pass over vertex/lighting Shadergens As much as possible, the asserts have been moved out of the GetUID function. But there are some places where asserts depend on variables that aren't stored in the shader UID.
2016-01-16 11:34:06 +00:00
break;
Convert XFMemory to BitField and enum class Additionally a new ClipDisable union has been added (though it is not currently used by Dolphin).
2021-02-11 00:01:42 +00:00
case TexGenType::Regular:
Multithreadded Shadergen: Second Pass over vertex/lighting Shadergens As much as possible, the asserts have been moved out of the GetUID function. But there are some places where asserts depend on variables that aren't stored in the shader UID.
2016-01-16 11:34:06 +00:00
default:
Convert XFMemory to BitField and enum class Additionally a new ClipDisable union has been added (though it is not currently used by Dolphin).
2021-02-11 00:01:42 +00:00
uid_data->texMtxInfo_n_projection |= static_cast<u32>(xfmem.texMtxInfo[i].projection.Value())
<< i;
Multithreadded Shadergen: Second Pass over vertex/lighting Shadergens As much as possible, the asserts have been moved out of the GetUID function. But there are some places where asserts depend on variables that aren't stored in the shader UID.
2016-01-16 11:34:06 +00:00
break;
}
uid_data->dualTexTrans_enabled = xfmem.dualTexTrans.enabled;
// CHECKME: does this only work for regular tex gen types?
Convert XFMemory to BitField and enum class Additionally a new ClipDisable union has been added (though it is not currently used by Dolphin).
2021-02-11 00:01:42 +00:00
if (uid_data->dualTexTrans_enabled && texinfo.texgentype == TexGenType::Regular)
Multithreadded Shadergen: Second Pass over vertex/lighting Shadergens As much as possible, the asserts have been moved out of the GetUID function. But there are some places where asserts depend on variables that aren't stored in the shader UID.
2016-01-16 11:34:06 +00:00
{
auto& postInfo = uid_data->postMtxInfo[i];
postInfo.index = xfmem.postMtxInfo[i].index;
postInfo.normalize = xfmem.postMtxInfo[i].normalize;
}
}
return out;
}
ShaderGen: Pass host config to shader generation functions Also moves the host config checks to common.
2017-07-20 07:10:02 +00:00
ShaderCode GenerateVertexShaderCode(APIType api_type, const ShaderHostConfig& host_config,
const vertex_shader_uid_data* uid_data)
Multithreadded Shadergen: Second Pass over vertex/lighting Shadergens As much as possible, the asserts have been moved out of the GetUID function. But there are some places where asserts depend on variables that aren't stored in the shader UID.
2016-01-16 11:34:06 +00:00
{
ShaderCode out;
ShaderGen: Remove host state from shader uids
2017-06-24 08:18:53 +00:00
const bool per_pixel_lighting = g_ActiveConfig.bEnablePixelLighting;
ShaderGen: Pass host config to shader generation functions Also moves the host config checks to common.
2017-07-20 07:10:02 +00:00
const bool msaa = host_config.msaa;
const bool ssaa = host_config.ssaa;
const bool vertex_rounding = host_config.vertex_rounding;
ShaderGen: Remove host state from shader uids
2017-06-24 08:18:53 +00:00
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("{}", s_lighting_struct);
Reformat all the things. Have fun with merge conflicts.
2016-06-24 08:43:46 +00:00
Fixup line endings.
2011-09-29 19:52:13 +00:00
// uniforms
VideoCommon: Add APIType entry for Vulkan
2016-08-12 14:55:00 +00:00
if (api_type == APIType::OpenGL || api_type == APIType::Vulkan)
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("UBO_BINDING(std140, 2) uniform VSBlock {{\n");
ShaderGen: use cbuffers for D3D
2014-03-17 09:19:54 +00:00
else
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("cbuffer VSBlock {{\n");
VideoCommon: Add APIType entry for Vulkan
2016-08-12 14:55:00 +00:00
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("{}", s_shader_uniforms);
out.Write("}};\n");
Reformat all the things. Have fun with merge conflicts.
2016-06-24 08:43:46 +00:00
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("struct VS_OUTPUT {{\n");
ShaderGen: Omit some unused varyings when possible Removes the clipPos varying unless slow-depth is used, and the clipDistance varyings if geometry shaders are not used.
2019-01-23 08:11:17 +00:00
GenerateVSOutputMembers(out, api_type, uid_data->numTexGens, host_config, "");
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("}};\n");
Reformat all the things. Have fun with merge conflicts.
2016-06-24 08:43:46 +00:00
VideoCommon: Add APIType entry for Vulkan
2016-08-12 14:55:00 +00:00
if (api_type == APIType::OpenGL || api_type == APIType::Vulkan)
Replace the shader uid system with a new one which quasi-automatically generates uids for shaders. Currently used in the vertex shader only (had to fork lighting shaders for now).
2012-08-06 20:41:30 +00:00
{
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("ATTRIBUTE_LOCATION({}) in float4 rawpos;\n", SHADER_POSITION_ATTRIB);
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
if ((uid_data->components & VB_HAS_POSMTXIDX) != 0)
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("ATTRIBUTE_LOCATION({}) in uint4 posmtx;\n", SHADER_POSMTX_ATTRIB);
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
if ((uid_data->components & VB_HAS_NRM0) != 0)
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("ATTRIBUTE_LOCATION({}) in float3 rawnorm0;\n", SHADER_NORM0_ATTRIB);
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
if ((uid_data->components & VB_HAS_NRM1) != 0)
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("ATTRIBUTE_LOCATION({}) in float3 rawnorm1;\n", SHADER_NORM1_ATTRIB);
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
if ((uid_data->components & VB_HAS_NRM2) != 0)
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("ATTRIBUTE_LOCATION({}) in float3 rawnorm2;\n", SHADER_NORM2_ATTRIB);
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
if ((uid_data->components & VB_HAS_COL0) != 0)
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("ATTRIBUTE_LOCATION({}) in float4 rawcolor0;\n", SHADER_COLOR0_ATTRIB);
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
if ((uid_data->components & VB_HAS_COL1) != 0)
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("ATTRIBUTE_LOCATION({}) in float4 rawcolor1;\n", SHADER_COLOR1_ATTRIB);
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
for (u32 i = 0; i < 8; ++i)
Formatting cleanup for VideoCommon. Block braces on new lines. Also killed off trailing whitespace and dangling elses. Spaced some things out to make them more readable (only in places where it looked like a bit of a clusterfuck).
2013-04-24 13:21:54 +00:00
{
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
const u32 has_texmtx = (uid_data->components & (VB_HAS_TEXMTXIDX0 << i));
if ((uid_data->components & (VB_HAS_UV0 << i)) != 0 || has_texmtx != 0)
ShaderGen: Specify attribute/output locations/bindings explicitly This also shifts the SSBO index from index 3 to index 0.
2016-08-12 14:40:18 +00:00
{
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("ATTRIBUTE_LOCATION({}) in float{} rawtex{};\n", SHADER_TEXTURE0_ATTRIB + i,
has_texmtx != 0 ? 3 : 2, i);
ShaderGen: Specify attribute/output locations/bindings explicitly This also shifts the SSBO index from index 3 to index 0.
2016-08-12 14:40:18 +00:00
}
Add in GLSL setting again. PS and VS making. Untested and won't work for now. Add in program shader cache files. Readd NativeVertexFormat stuffs. Add in PS and VS cache things. SetShaders in places. Fixed EFB cache index computations in OpenGL renderer. The previous computation was very likely to go out of array bounds, which could result in crashes on EFB access. Also, the cache size was rounded down instead of up. This is a problem since EFB_HEIGHT (528) is not a multiple of EFB_CACHE_RECT_SIZE (64).
2011-12-01 03:00:21 +00:00
}
Reformat all the things. Have fun with merge conflicts.
2016-06-24 08:43:46 +00:00
ShaderGen: Don't use interface blocks on Vulkan without GS Doing so causes the Adreno driver to choke and spew errors about too many output locations/components, when clearly we're under the limit.
2019-01-23 08:12:13 +00:00
if (host_config.backend_geometry_shaders)
VideoCommon: Only use interface blocks when geometry shaders are supported.
2014-12-17 08:18:40 +00:00
{
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("VARYING_LOCATION(0) out VertexData {{\n");
ShaderGen: Omit some unused varyings when possible Removes the clipPos varying unless slow-depth is used, and the clipDistance varyings if geometry shaders are not used.
2019-01-23 08:11:17 +00:00
GenerateVSOutputMembers(out, api_type, uid_data->numTexGens, host_config,
ShaderGen: Remove host state from shader uids
2017-06-24 08:18:53 +00:00
GetInterpolationQualifier(msaa, ssaa, true, false));
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("}} vs;\n");
VideoCommon: Only use interface blocks when geometry shaders are supported.
2014-12-17 08:18:40 +00:00
}
else
{
VideoCommon: Don't pass structs between shader stages when geometry shaders are unsupported.
2014-12-17 22:44:05 +00:00
// Let's set up attributes
ShaderGen: Don't use interface blocks on Vulkan without GS Doing so causes the Adreno driver to choke and spew errors about too many output locations/components, when clearly we're under the limit.
2019-01-23 08:12:13 +00:00
u32 counter = 0;
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("VARYING_LOCATION({}) {} out float4 colors_0;\n", counter++,
GetInterpolationQualifier(msaa, ssaa));
out.Write("VARYING_LOCATION({}) {} out float4 colors_1;\n", counter++,
GetInterpolationQualifier(msaa, ssaa));
ShaderGen: Don't use interface blocks on Vulkan without GS Doing so causes the Adreno driver to choke and spew errors about too many output locations/components, when clearly we're under the limit.
2019-01-23 08:12:13 +00:00
for (u32 i = 0; i < uid_data->numTexGens; ++i)
VideoCommon: Don't pass structs between shader stages when geometry shaders are unsupported.
2014-12-17 22:44:05 +00:00
{
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("VARYING_LOCATION({}) {} out float3 tex{};\n", counter++,
GetInterpolationQualifier(msaa, ssaa), i);
VideoCommon: Don't pass structs between shader stages when geometry shaders are unsupported.
2014-12-17 22:44:05 +00:00
}
ShaderGen: Omit some unused varyings when possible Removes the clipPos varying unless slow-depth is used, and the clipDistance varyings if geometry shaders are not used.
2019-01-23 08:11:17 +00:00
if (!host_config.fast_depth_calc)
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
{
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("VARYING_LOCATION({}) {} out float4 clipPos;\n", counter++,
GetInterpolationQualifier(msaa, ssaa));
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
}
ShaderGen: Remove host state from shader uids
2017-06-24 08:18:53 +00:00
if (per_pixel_lighting)
Move worldpos into it's own varying. Previously it was packed into spare slots in clippos.xy and normal.w, but it's ugly and more importantly it's causing bugs. This was discovered during the debugging of a zfreeze branch, which expected clippos.xy to be xy position coordinates in clipspace (as the name suggested). Turns out the stereoscopy shader had also run into this trap, modifying clippos.x (introducing errors with per-pixel lighting). This commit has been moved outside of the zfreeze PR for fast merging.
2015-01-02 12:44:04 +00:00
{
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("VARYING_LOCATION({}) {} out float3 Normal;\n", counter++,
GetInterpolationQualifier(msaa, ssaa));
out.Write("VARYING_LOCATION({}) {} out float3 WorldPos;\n", counter++,
GetInterpolationQualifier(msaa, ssaa));
Move worldpos into it's own varying. Previously it was packed into spare slots in clippos.xy and normal.w, but it's ugly and more importantly it's causing bugs. This was discovered during the debugging of a zfreeze branch, which expected clippos.xy to be xy position coordinates in clipspace (as the name suggested). Turns out the stereoscopy shader had also run into this trap, modifying clippos.x (introducing errors with per-pixel lighting). This commit has been moved outside of the zfreeze PR for fast merging.
2015-01-02 12:44:04 +00:00
}
VideoCommon: Only use interface blocks when geometry shaders are supported.
2014-12-17 08:18:40 +00:00
}
Reformat all the things. Have fun with merge conflicts.
2016-06-24 08:43:46 +00:00
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("void main()\n{{\n");
Fixup line endings.
2011-09-29 19:52:13 +00:00
}
Shader generators: Remove any references to D3D9 and cleanup the affected code.
2013-09-22 16:07:21 +00:00
else // D3D
Replace the shader uid system with a new one which quasi-automatically generates uids for shaders. Currently used in the vertex shader only (had to fork lighting shaders for now).
2012-08-06 20:41:30 +00:00
{
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("VS_OUTPUT main(\n");
Reformat all the things. Have fun with merge conflicts.
2016-06-24 08:43:46 +00:00
Add in GLSL setting again. PS and VS making. Untested and won't work for now. Add in program shader cache files. Readd NativeVertexFormat stuffs. Add in PS and VS cache things. SetShaders in places. Fixed EFB cache index computations in OpenGL renderer. The previous computation was very likely to go out of array bounds, which could result in crashes on EFB access. Also, the cache size was rounded down instead of up. This is a problem since EFB_HEIGHT (528) is not a multiple of EFB_CACHE_RECT_SIZE (64).
2011-12-01 03:00:21 +00:00
// inputs
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
if ((uid_data->components & VB_HAS_NRM0) != 0)
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write(" float3 rawnorm0 : NORMAL0,\n");
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
if ((uid_data->components & VB_HAS_NRM1) != 0)
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write(" float3 rawnorm1 : NORMAL1,\n");
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
if ((uid_data->components & VB_HAS_NRM2) != 0)
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write(" float3 rawnorm2 : NORMAL2,\n");
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
if ((uid_data->components & VB_HAS_COL0) != 0)
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write(" float4 rawcolor0 : COLOR0,\n");
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
if ((uid_data->components & VB_HAS_COL1) != 0)
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write(" float4 rawcolor1 : COLOR1,\n");
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
for (u32 i = 0; i < 8; ++i)
Formatting cleanup for VideoCommon. Block braces on new lines. Also killed off trailing whitespace and dangling elses. Spaced some things out to make them more readable (only in places where it looked like a bit of a clusterfuck).
2013-04-24 13:21:54 +00:00
{
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
const u32 has_texmtx = (uid_data->components & (VB_HAS_TEXMTXIDX0 << i));
if ((uid_data->components & (VB_HAS_UV0 << i)) != 0 || has_texmtx != 0)
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write(" float{} rawtex{} : TEXCOORD{},\n", has_texmtx ? 3 : 2, i, i);
Add in GLSL setting again. PS and VS making. Untested and won't work for now. Add in program shader cache files. Readd NativeVertexFormat stuffs. Add in PS and VS cache things. SetShaders in places. Fixed EFB cache index computations in OpenGL renderer. The previous computation was very likely to go out of array bounds, which could result in crashes on EFB access. Also, the cache size was rounded down instead of up. This is a problem since EFB_HEIGHT (528) is not a multiple of EFB_CACHE_RECT_SIZE (64).
2011-12-01 03:00:21 +00:00
}
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
if ((uid_data->components & VB_HAS_POSMTXIDX) != 0)
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write(" uint4 posmtx : BLENDINDICES,\n");
out.Write(" float4 rawpos : POSITION) {{\n");
Fixup line endings.
2011-09-29 19:52:13 +00:00
}
Reformat all the things. Have fun with merge conflicts.
2016-06-24 08:43:46 +00:00
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("VS_OUTPUT o;\n");
Reformat all the things. Have fun with merge conflicts.
2016-06-24 08:43:46 +00:00
LightingShaderGen: Always calculate lighting for both color channels Cel-damage depends on lighting being calculated for the first channel even though there is no color in the vertex format (defaults to the material color). If lighting for the channel is not enabled, the vertex will use the default color as before. The default value of the color is determined by the number of elements in the vertex format. This fixes the grey cubes in Super Mario Sunshine. If the color channel count is zero, we set the color to black before the end of the vertex shader. It's possible that this would be undefined behavior on hardware if a vertex color index that was greater than the channel count was used within TEV.
2017-01-29 12:38:48 +00:00
// xfmem.numColorChans controls the number of color channels available to TEV, but we still need
// to generate all channels here, as it can be used in texgen. Cel-damage is an example of this.
out.Write("float4 vertex_color_0, vertex_color_1;\n");
// To use color 1, the vertex descriptor must have color 0 and 1.
// If color 1 is present but not color 0, it is used for lighting channel 0.
const bool use_color_1 =
(uid_data->components & (VB_HAS_COL0 | VB_HAS_COL1)) == (VB_HAS_COL0 | VB_HAS_COL1);
for (u32 color = 0; color < NUM_XF_COLOR_CHANNELS; color++)
{
if ((color == 0 || use_color_1) && (uid_data->components & (VB_HAS_COL0 << color)) != 0)
{
// Use color0 for channel 0, and color1 for channel 1 if both colors 0 and 1 are present.
out.Write("vertex_color_{0} = rawcolor{0};\n", color);
}
else if (color == 0 && (uid_data->components & VB_HAS_COL1) != 0)
{
// Use color1 for channel 0 if color0 is not present.
out.Write("vertex_color_{} = rawcolor1;\n", color);
}
else
{
// The default alpha channel depends on the number of components in the vertex format.
out.Write(
"vertex_color_{0} = float4(1.0, 1.0, 1.0, float((color_chan_alpha >> {0}) & 1u));\n",
color);
}
}
Fixup line endings.
2011-09-29 19:52:13 +00:00
// transforms
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
if ((uid_data->components & VB_HAS_POSMTXIDX) != 0)
Fixup line endings.
2011-09-29 19:52:13 +00:00
{
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("int posidx = int(posmtx.r);\n"
"float4 pos = float4(dot(" I_TRANSFORMMATRICES
"[posidx], rawpos), dot(" I_TRANSFORMMATRICES
"[posidx+1], rawpos), dot(" I_TRANSFORMMATRICES "[posidx+2], rawpos), 1);\n");
Reformat all the things. Have fun with merge conflicts.
2016-06-24 08:43:46 +00:00
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
if ((uid_data->components & VB_HAS_NRMALL) != 0)
Remove all of our workarounds for Qualcomm devices we don't support anymore.
2015-09-05 04:45:35 +00:00
{
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("int normidx = posidx & 31;\n"
"float3 N0 = " I_NORMALMATRICES "[normidx].xyz, N1 = " I_NORMALMATRICES
"[normidx+1].xyz, N2 = " I_NORMALMATRICES "[normidx+2].xyz;\n");
[Android] Start of *working* GLES3 support. Needs to be able to compile in Windows still.
2013-06-11 13:33:56 +00:00
}
Reformat all the things. Have fun with merge conflicts.
2016-06-24 08:43:46 +00:00
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
if ((uid_data->components & VB_HAS_NRM0) != 0)
{
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("float3 _norm0 = normalize(float3(dot(N0, rawnorm0), dot(N1, rawnorm0), dot(N2, "
"rawnorm0)));\n");
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
}
if ((uid_data->components & VB_HAS_NRM1) != 0)
{
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write(
Replace the shader uid system with a new one which quasi-automatically generates uids for shaders. Currently used in the vertex shader only (had to fork lighting shaders for now).
2012-08-06 20:41:30 +00:00
"float3 _norm1 = float3(dot(N0, rawnorm1), dot(N1, rawnorm1), dot(N2, rawnorm1));\n");
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
}
if ((uid_data->components & VB_HAS_NRM2) != 0)
{
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write(
Replace the shader uid system with a new one which quasi-automatically generates uids for shaders. Currently used in the vertex shader only (had to fork lighting shaders for now).
2012-08-06 20:41:30 +00:00
"float3 _norm2 = float3(dot(N0, rawnorm2), dot(N1, rawnorm2), dot(N2, rawnorm2));\n");
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
}
Fixup line endings.
2011-09-29 19:52:13 +00:00
}
else
{
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("float4 pos = float4(dot(" I_POSNORMALMATRIX "[0], rawpos), dot(" I_POSNORMALMATRIX
"[1], rawpos), dot(" I_POSNORMALMATRIX "[2], rawpos), 1.0);\n");
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
if ((uid_data->components & VB_HAS_NRM0) != 0)
{
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("float3 _norm0 = normalize(float3(dot(" I_POSNORMALMATRIX
"[3].xyz, rawnorm0), dot(" I_POSNORMALMATRIX
"[4].xyz, rawnorm0), dot(" I_POSNORMALMATRIX "[5].xyz, rawnorm0)));\n");
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
}
if ((uid_data->components & VB_HAS_NRM1) != 0)
{
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("float3 _norm1 = float3(dot(" I_POSNORMALMATRIX
"[3].xyz, rawnorm1), dot(" I_POSNORMALMATRIX
"[4].xyz, rawnorm1), dot(" I_POSNORMALMATRIX "[5].xyz, rawnorm1));\n");
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
}
if ((uid_data->components & VB_HAS_NRM2) != 0)
{
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("float3 _norm2 = float3(dot(" I_POSNORMALMATRIX
"[3].xyz, rawnorm2), dot(" I_POSNORMALMATRIX
"[4].xyz, rawnorm2), dot(" I_POSNORMALMATRIX "[5].xyz, rawnorm2));\n");
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
}
Fixup line endings.
2011-09-29 19:52:13 +00:00
}
Reformat all the things. Have fun with merge conflicts.
2016-06-24 08:43:46 +00:00
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
if ((uid_data->components & VB_HAS_NRM0) == 0)
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("float3 _norm0 = float3(0.0, 0.0, 0.0);\n");
Reformat all the things. Have fun with merge conflicts.
2016-06-24 08:43:46 +00:00
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("o.pos = float4(dot(" I_PROJECTION "[0], pos), dot(" I_PROJECTION
"[1], pos), dot(" I_PROJECTION "[2], pos), dot(" I_PROJECTION "[3], pos));\n");
Reformat all the things. Have fun with merge conflicts.
2016-06-24 08:43:46 +00:00
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("int4 lacc;\n"
"float3 ldir, h, cosAttn, distAttn;\n"
"float dist, dist2, attn;\n");
Reformat all the things. Have fun with merge conflicts.
2016-06-24 08:43:46 +00:00
LightingShaderGen: Always calculate lighting for both color channels Cel-damage depends on lighting being calculated for the first channel even though there is no color in the vertex format (defaults to the material color). If lighting for the channel is not enabled, the vertex will use the default color as before. The default value of the color is determined by the number of elements in the vertex format. This fixes the grey cubes in Super Mario Sunshine. If the color channel count is zero, we set the color to black before the end of the vertex shader. It's possible that this would be undefined behavior on hardware if a vertex color index that was greater than the channel count was used within TEV.
2017-01-29 12:38:48 +00:00
GenerateLightingShaderCode(out, uid_data->lighting, "vertex_color_", "o.colors_");
Reformat all the things. Have fun with merge conflicts.
2016-06-24 08:43:46 +00:00
Fixup line endings.
2011-09-29 19:52:13 +00:00
// transform texcoords
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("float4 coord = float4(0.0, 0.0, 1.0, 1.0);\n");
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
for (u32 i = 0; i < uid_data->numTexGens; ++i)
Formatting cleanup for VideoCommon. Block braces on new lines. Also killed off trailing whitespace and dangling elses. Spaced some things out to make them more readable (only in places where it looked like a bit of a clusterfuck).
2013-04-24 13:21:54 +00:00
{
Multithreadded Shadergen: First Pass over vertex/lighting Shadergens The only code which touches xfmem is code which writes directly into uid_data. All the rest now read their parameters out of uid_data. I also simplified the lighting code so it always generated seperate codepaths for alpha and color channels instead of trying to combine them on the off-chance that the same equation works for all 4 channels. As modern (post 2008) GPUs generally don't calcualte all 4 channels in a single vector, this optimisation is pointless. The shader compiler will undo it during the GLSL/HLSL to IR step. Bug Fix: The about optimisation was also broken, applying the color light equation to the alpha light channel instead of the alpha light euqation. But doesn't look like anything trigged this bug.
2016-01-14 05:51:37 +00:00
auto& texinfo = uid_data->texMtxInfo[i];
Reformat all the things. Have fun with merge conflicts.
2016-06-24 08:43:46 +00:00
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("{{\n");
out.Write("coord = float4(0.0, 0.0, 1.0, 1.0);\n");
Formatting cleanup for VideoCommon. Block braces on new lines. Also killed off trailing whitespace and dangling elses. Spaced some things out to make them more readable (only in places where it looked like a bit of a clusterfuck).
2013-04-24 13:21:54 +00:00
switch (texinfo.sourcerow)
{
Convert XFMemory to BitField and enum class Additionally a new ClipDisable union has been added (though it is not currently used by Dolphin).
2021-02-11 00:01:42 +00:00
case SourceRow::Geom:
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("coord.xyz = rawpos.xyz;\n");
Fixup line endings.
2011-09-29 19:52:13 +00:00
break;
Convert XFMemory to BitField and enum class Additionally a new ClipDisable union has been added (though it is not currently used by Dolphin).
2021-02-11 00:01:42 +00:00
case SourceRow::Normal:
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
if ((uid_data->components & VB_HAS_NRM0) != 0)
Formatting cleanup for VideoCommon. Block braces on new lines. Also killed off trailing whitespace and dangling elses. Spaced some things out to make them more readable (only in places where it looked like a bit of a clusterfuck).
2013-04-24 13:21:54 +00:00
{
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("coord.xyz = rawnorm0.xyz;\n");
Fixup line endings.
2011-09-29 19:52:13 +00:00
}
break;
Convert XFMemory to BitField and enum class Additionally a new ClipDisable union has been added (though it is not currently used by Dolphin).
2021-02-11 00:01:42 +00:00
case SourceRow::Colors:
ASSERT(texinfo.texgentype == TexGenType::Color0 || texinfo.texgentype == TexGenType::Color1);
Fixup line endings.
2011-09-29 19:52:13 +00:00
break;
Convert XFMemory to BitField and enum class Additionally a new ClipDisable union has been added (though it is not currently used by Dolphin).
2021-02-11 00:01:42 +00:00
case SourceRow::BinormalT:
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
if ((uid_data->components & VB_HAS_NRM1) != 0)
Formatting cleanup for VideoCommon. Block braces on new lines. Also killed off trailing whitespace and dangling elses. Spaced some things out to make them more readable (only in places where it looked like a bit of a clusterfuck).
2013-04-24 13:21:54 +00:00
{
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("coord.xyz = rawnorm1.xyz;\n");
Fixup line endings.
2011-09-29 19:52:13 +00:00
}
break;
Convert XFMemory to BitField and enum class Additionally a new ClipDisable union has been added (though it is not currently used by Dolphin).
2021-02-11 00:01:42 +00:00
case SourceRow::BinormalB:
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
if ((uid_data->components & VB_HAS_NRM2) != 0)
Formatting cleanup for VideoCommon. Block braces on new lines. Also killed off trailing whitespace and dangling elses. Spaced some things out to make them more readable (only in places where it looked like a bit of a clusterfuck).
2013-04-24 13:21:54 +00:00
{
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("coord.xyz = rawnorm2.xyz;\n");
Fixup line endings.
2011-09-29 19:52:13 +00:00
}
break;
default:
Convert XFMemory to BitField and enum class Additionally a new ClipDisable union has been added (though it is not currently used by Dolphin).
2021-02-11 00:01:42 +00:00
ASSERT(texinfo.sourcerow >= SourceRow::Tex0 && texinfo.sourcerow <= SourceRow::Tex7);
u32 texnum = static_cast<u32>(texinfo.sourcerow) - static_cast<u32>(SourceRow::Tex0);
if ((uid_data->components & (VB_HAS_UV0 << (texnum))) != 0)
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
{
Convert XFMemory to BitField and enum class Additionally a new ClipDisable union has been added (though it is not currently used by Dolphin).
2021-02-11 00:01:42 +00:00
out.Write("coord = float4(rawtex{}.x, rawtex{}.y, 1.0, 1.0);\n", texnum, texnum);
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
}
Fixup line endings.
2011-09-29 19:52:13 +00:00
break;
}
Confirm with hardware test that the high bit of the input form is ignored. Thanks to Ornox for testing
2016-02-29 17:52:25 +00:00
// Input form of AB11 sets z element to 1.0
Multithreadded Shadergen: Second Pass over vertex/lighting Shadergens As much as possible, the asserts have been moved out of the GetUID function. But there are some places where asserts depend on variables that aren't stored in the shader UID.
2016-01-16 11:34:06 +00:00
Convert XFMemory to BitField and enum class Additionally a new ClipDisable union has been added (though it is not currently used by Dolphin).
2021-02-11 00:01:42 +00:00
if (texinfo.inputform == TexInputForm::AB11)
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("coord.z = 1.0;\n");
Reformat all the things. Have fun with merge conflicts.
2016-06-24 08:43:46 +00:00
Fixup line endings.
2011-09-29 19:52:13 +00:00
// first transformation
Formatting cleanup for VideoCommon. Block braces on new lines. Also killed off trailing whitespace and dangling elses. Spaced some things out to make them more readable (only in places where it looked like a bit of a clusterfuck).
2013-04-24 13:21:54 +00:00
switch (texinfo.texgentype)
{
Convert XFMemory to BitField and enum class Additionally a new ClipDisable union has been added (though it is not currently used by Dolphin).
2021-02-11 00:01:42 +00:00
case TexGenType::EmbossMap: // calculate tex coords into bump map
Reformat all the things. Have fun with merge conflicts.
2016-06-24 08:43:46 +00:00
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
if ((uid_data->components & (VB_HAS_NRM1 | VB_HAS_NRM2)) != 0)
Formatting cleanup for VideoCommon. Block braces on new lines. Also killed off trailing whitespace and dangling elses. Spaced some things out to make them more readable (only in places where it looked like a bit of a clusterfuck).
2013-04-24 13:21:54 +00:00
{
Fixup line endings.
2011-09-29 19:52:13 +00:00
// transform the light dir into tangent space
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("ldir = normalize(" LIGHT_POS ".xyz - pos.xyz);\n",
LIGHT_POS_PARAMS(texinfo.embosslightshift));
out.Write(
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
"o.tex{}.xyz = o.tex{}.xyz + float3(dot(ldir, _norm1), dot(ldir, _norm2), 0.0);\n", i,
[Android] Tegra 4 'support.' This brings up the OpenGL backend to support Tegra 4 to the point where it will run games but it doesn't have any video output for some reason. This is a large change that doesn't actually change much functionally. Walking through the changes. It changes the string in the Android backend select to just OpenGL ES. Adds a check in the Android code to check for Tegra 4 and to enable the option to select the OpenGL ES backend. Adds a DriverDetails bug under BUG_ISTEGRA as a blanket case of Tegra 4 support. The changes that effects most lines in this change. Removing all float suffixes in the pixel/vertex/util shaders since OpenGL ES 2 doesn't support float suffixes. Disables the shaders for reinterpreting the EFB format since Tegra 4 doesn't support integers. Changes GLFunctions.cpp to grab the correct Tegra extension functions. Readds the GLSL 1.2 'hacks' as GLSLES2 'hacks' since they are required for GLSL ES 2 Adds a GLSLES2 to the GLSL_VERSION enum. Disable the SamplerCache on Tegra since Tegra doesn't support samplers... Enable glBufferSubData on Tegra since it is the only mobile GPU to correctly work with it. Disable glDrawRangeElements on Tegra since it doesn't support it, This uses glDrawElements instead.
2013-10-06 08:12:13 +00:00
texinfo.embosssourceshift);
Fixup line endings.
2011-09-29 19:52:13 +00:00
}
else
{
Disables assert messages that seem to be invalid.
2015-07-08 20:06:11 +00:00
// The following assert was triggered in House of the Dead Overkill and Star Wars Rogue
// Squadron 2
Assert: Uppercase assertion macros Macros should be all upper-cased. This is also kind of a wart that's been sticking out for quite a while now (we avoid prefixing underscores).
2018-03-15 00:34:35 +00:00
// ASSERT(0); // should have normals
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("o.tex{}.xyz = o.tex{}.xyz;\n", i, texinfo.embosssourceshift);
Fixup line endings.
2011-09-29 19:52:13 +00:00
}
Reformat all the things. Have fun with merge conflicts.
2016-06-24 08:43:46 +00:00
Fixup line endings.
2011-09-29 19:52:13 +00:00
break;
Convert XFMemory to BitField and enum class Additionally a new ClipDisable union has been added (though it is not currently used by Dolphin).
2021-02-11 00:01:42 +00:00
case TexGenType::Color0:
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("o.tex{}.xyz = float3(o.colors_0.x, o.colors_0.y, 1);\n", i);
Fixup line endings.
2011-09-29 19:52:13 +00:00
break;
Convert XFMemory to BitField and enum class Additionally a new ClipDisable union has been added (though it is not currently used by Dolphin).
2021-02-11 00:01:42 +00:00
case TexGenType::Color1:
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("o.tex{}.xyz = float3(o.colors_1.x, o.colors_1.y, 1);\n", i);
Fixup line endings.
2011-09-29 19:52:13 +00:00
break;
Convert XFMemory to BitField and enum class Additionally a new ClipDisable union has been added (though it is not currently used by Dolphin).
2021-02-11 00:01:42 +00:00
case TexGenType::Regular:
Fixup line endings.
2011-09-29 19:52:13 +00:00
default:
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
if ((uid_data->components & (VB_HAS_TEXMTXIDX0 << i)) != 0)
Now CG plays nice with this new stuff.
2011-12-01 06:33:12 +00:00
{
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("int tmp = int(rawtex{}.z);\n", i);
Convert XFMemory to BitField and enum class Additionally a new ClipDisable union has been added (though it is not currently used by Dolphin).
2021-02-11 00:01:42 +00:00
if (static_cast<TexSize>((uid_data->texMtxInfo_n_projection >> i) & 1) == TexSize::STQ)
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
{
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("o.tex{}.xyz = float3(dot(coord, " I_TRANSFORMMATRICES
"[tmp]), dot(coord, " I_TRANSFORMMATRICES
"[tmp+1]), dot(coord, " I_TRANSFORMMATRICES "[tmp+2]));\n",
i);
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
}
Formatting cleanup for VideoCommon. Block braces on new lines. Also killed off trailing whitespace and dangling elses. Spaced some things out to make them more readable (only in places where it looked like a bit of a clusterfuck).
2013-04-24 13:21:54 +00:00
else
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
{
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("o.tex{}.xyz = float3(dot(coord, " I_TRANSFORMMATRICES
"[tmp]), dot(coord, " I_TRANSFORMMATRICES "[tmp+1]), 1);\n",
i);
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
}
Fixup line endings.
2011-09-29 19:52:13 +00:00
}
Formatting cleanup for VideoCommon. Block braces on new lines. Also killed off trailing whitespace and dangling elses. Spaced some things out to make them more readable (only in places where it looked like a bit of a clusterfuck).
2013-04-24 13:21:54 +00:00
else
{
Convert XFMemory to BitField and enum class Additionally a new ClipDisable union has been added (though it is not currently used by Dolphin).
2021-02-11 00:01:42 +00:00
if (static_cast<TexSize>((uid_data->texMtxInfo_n_projection >> i) & 1) == TexSize::STQ)
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
{
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("o.tex{}.xyz = float3(dot(coord, " I_TEXMATRICES
"[{}]), dot(coord, " I_TEXMATRICES "[{}]), dot(coord, " I_TEXMATRICES
"[{}]));\n",
i, 3 * i, 3 * i + 1, 3 * i + 2);
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
}
Fixup line endings.
2011-09-29 19:52:13 +00:00
else
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
{
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("o.tex{}.xyz = float3(dot(coord, " I_TEXMATRICES
"[{}]), dot(coord, " I_TEXMATRICES "[{}]), 1);\n",
i, 3 * i, 3 * i + 1);
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
}
Fixup line endings.
2011-09-29 19:52:13 +00:00
}
break;
}
Reformat all the things. Have fun with merge conflicts.
2016-06-24 08:43:46 +00:00
Formatting cleanup for VideoCommon. Block braces on new lines. Also killed off trailing whitespace and dangling elses. Spaced some things out to make them more readable (only in places where it looked like a bit of a clusterfuck).
2013-04-24 13:21:54 +00:00
// CHECKME: does this only work for regular tex gen types?
Convert XFMemory to BitField and enum class Additionally a new ClipDisable union has been added (though it is not currently used by Dolphin).
2021-02-11 00:01:42 +00:00
if (uid_data->dualTexTrans_enabled && texinfo.texgentype == TexGenType::Regular)
Formatting cleanup for VideoCommon. Block braces on new lines. Also killed off trailing whitespace and dangling elses. Spaced some things out to make them more readable (only in places where it looked like a bit of a clusterfuck).
2013-04-24 13:21:54 +00:00
{
Multithreadded Shadergen: First Pass over vertex/lighting Shadergens The only code which touches xfmem is code which writes directly into uid_data. All the rest now read their parameters out of uid_data. I also simplified the lighting code so it always generated seperate codepaths for alpha and color channels instead of trying to combine them on the off-chance that the same equation works for all 4 channels. As modern (post 2008) GPUs generally don't calcualte all 4 channels in a single vector, this optimisation is pointless. The shader compiler will undo it during the GLSL/HLSL to IR step. Bug Fix: The about optimisation was also broken, applying the color light equation to the alpha light channel instead of the alpha light euqation. But doesn't look like anything trigged this bug.
2016-01-14 05:51:37 +00:00
auto& postInfo = uid_data->postMtxInfo[i];
Reformat all the things. Have fun with merge conflicts.
2016-06-24 08:43:46 +00:00
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("float4 P0 = " I_POSTTRANSFORMMATRICES "[{}];\n"
"float4 P1 = " I_POSTTRANSFORMMATRICES "[{}];\n"
"float4 P2 = " I_POSTTRANSFORMMATRICES "[{}];\n",
postInfo.index & 0x3f, (postInfo.index + 1) & 0x3f, (postInfo.index + 2) & 0x3f);
Reformat all the things. Have fun with merge conflicts.
2016-06-24 08:43:46 +00:00
VertexShader: Remove 'special case' that has been disabled forever.
2015-10-23 06:00:41 +00:00
if (postInfo.normalize)
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("o.tex{}.xyz = normalize(o.tex{}.xyz);\n", i, i);
Reformat all the things. Have fun with merge conflicts.
2016-06-24 08:43:46 +00:00
VertexShader: Remove 'special case' that has been disabled forever.
2015-10-23 06:00:41 +00:00
// multiply by postmatrix
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write(
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
"o.tex{0}.xyz = float3(dot(P0.xyz, o.tex{0}.xyz) + P0.w, dot(P1.xyz, o.tex{0}.xyz) + "
"P1.w, dot(P2.xyz, o.tex{0}.xyz) + P2.w);\n",
i);
Fixup line endings.
2011-09-29 19:52:13 +00:00
}
Reformat all the things. Have fun with merge conflicts.
2016-06-24 08:43:46 +00:00
Comments
2016-08-31 07:44:36 +00:00
// When q is 0, the GameCube appears to have a special case
// This can be seen in devkitPro's neheGX Lesson08 example for Wii
// Makes differences in Rogue Squadron 3 (Hoth sky) and The Last Story (shadow culling)
// TODO: check if this only affects XF_TEXGEN_REGULAR
Convert XFMemory to BitField and enum class Additionally a new ClipDisable union has been added (though it is not currently used by Dolphin).
2021-02-11 00:01:42 +00:00
if (texinfo.texgentype == TexGenType::Regular)
Hardware renderer fix
2016-03-04 07:57:44 +00:00
{
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write(
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
"if(o.tex{0}.z == 0.0f)\n"
"\to.tex{0}.xy = clamp(o.tex{0}.xy / 2.0f, float2(-1.0f,-1.0f), float2(1.0f,1.0f));\n",
VertexShaderGen: Fix D3D X3014 compile error float2 requires 2 parameters in HLSL apparently.
2016-09-01 04:43:19 +00:00
i);
Hardware renderer fix
2016-03-04 07:57:44 +00:00
}
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("}}\n");
Fixup line endings.
2011-09-29 19:52:13 +00:00
}
Reformat all the things. Have fun with merge conflicts.
2016-06-24 08:43:46 +00:00
LightingShaderGen: Always calculate lighting for both color channels Cel-damage uses the color from the lighting stage of the vertex pipeline as texture coordinates, but sets numColorChans to zero. We now calculate the colors in all cases, but override the color before writing it from the vertex shader if numColorChans is set to a lower value.
2017-11-21 08:54:11 +00:00
if (uid_data->numColorChans == 0)
{
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
if ((uid_data->components & VB_HAS_COL0) != 0)
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("o.colors_0 = rawcolor0;\n");
LightingShaderGen: Always calculate lighting for both color channels Cel-damage uses the color from the lighting stage of the vertex pipeline as texture coordinates, but sets numColorChans to zero. We now calculate the colors in all cases, but override the color before writing it from the vertex shader if numColorChans is set to a lower value.
2017-11-21 08:54:11 +00:00
else
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("o.colors_0 = float4(1.0, 1.0, 1.0, 1.0);\n");
LightingShaderGen: Always calculate lighting for both color channels Cel-damage uses the color from the lighting stage of the vertex pipeline as texture coordinates, but sets numColorChans to zero. We now calculate the colors in all cases, but override the color before writing it from the vertex shader if numColorChans is set to a lower value.
2017-11-21 08:54:11 +00:00
}
if (uid_data->numColorChans < 2)
{
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
if ((uid_data->components & VB_HAS_COL1) != 0)
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("o.colors_1 = rawcolor1;\n");
LightingShaderGen: Always calculate lighting for both color channels Cel-damage uses the color from the lighting stage of the vertex pipeline as texture coordinates, but sets numColorChans to zero. We now calculate the colors in all cases, but override the color before writing it from the vertex shader if numColorChans is set to a lower value.
2017-11-21 08:54:11 +00:00
else
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("o.colors_1 = o.colors_0;\n");
LightingShaderGen: Always calculate lighting for both color channels Cel-damage uses the color from the lighting stage of the vertex pipeline as texture coordinates, but sets numColorChans to zero. We now calculate the colors in all cases, but override the color before writing it from the vertex shader if numColorChans is set to a lower value.
2017-11-21 08:54:11 +00:00
}
Fixup line endings.
2011-09-29 19:52:13 +00:00
// clipPos/w needs to be done in pixel shader, not here
ShaderGen: Omit some unused varyings when possible Removes the clipPos varying unless slow-depth is used, and the clipDistance varyings if geometry shaders are not used.
2019-01-23 08:11:17 +00:00
if (!host_config.fast_depth_calc)
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("o.clipPos = o.pos;\n");
Reformat all the things. Have fun with merge conflicts.
2016-06-24 08:43:46 +00:00
ShaderGen: Remove host state from shader uids
2017-06-24 08:18:53 +00:00
if (per_pixel_lighting)
Fixup line endings.
2011-09-29 19:52:13 +00:00
{
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("o.Normal = _norm0;\n"
"o.WorldPos = pos.xyz;\n");
Reformat all the things. Have fun with merge conflicts.
2016-06-24 08:43:46 +00:00
LightingShaderGen: Always calculate lighting for both color channels Cel-damage depends on lighting being calculated for the first channel even though there is no color in the vertex format (defaults to the material color). If lighting for the channel is not enabled, the vertex will use the default color as before. The default value of the color is determined by the number of elements in the vertex format. This fixes the grey cubes in Super Mario Sunshine. If the color channel count is zero, we set the color to black before the end of the vertex shader. It's possible that this would be undefined behavior on hardware if a vertex color index that was greater than the channel count was used within TEV.
2017-01-29 12:38:48 +00:00
// Pass through the vertex colors unmodified so we can evaluate the lighting in the same manner.
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
if ((uid_data->components & VB_HAS_COL0) != 0)
LightingShaderGen: Always calculate lighting for both color channels Cel-damage depends on lighting being calculated for the first channel even though there is no color in the vertex format (defaults to the material color). If lighting for the channel is not enabled, the vertex will use the default color as before. The default value of the color is determined by the number of elements in the vertex format. This fixes the grey cubes in Super Mario Sunshine. If the color channel count is zero, we set the color to black before the end of the vertex shader. It's possible that this would be undefined behavior on hardware if a vertex color index that was greater than the channel count was used within TEV.
2017-01-29 12:38:48 +00:00
out.Write("o.colors_0 = vertex_color_0;\n");
Reformat all the things. Have fun with merge conflicts.
2016-06-24 08:43:46 +00:00
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
if ((uid_data->components & VB_HAS_COL1) != 0)
LightingShaderGen: Always calculate lighting for both color channels Cel-damage depends on lighting being calculated for the first channel even though there is no color in the vertex format (defaults to the material color). If lighting for the channel is not enabled, the vertex will use the default color as before. The default value of the color is determined by the number of elements in the vertex format. This fixes the grey cubes in Super Mario Sunshine. If the color channel count is zero, we set the color to black before the end of the vertex shader. It's possible that this would be undefined behavior on hardware if a vertex color index that was greater than the channel count was used within TEV.
2017-01-29 12:38:48 +00:00
out.Write("o.colors_1 = vertex_color_1;\n");
}
else
{
// The number of colors available to TEV is determined by numColorChans.
// We have to provide the fields to match the interface, so set to zero if it's not enabled.
if (uid_data->numColorChans == 0)
out.Write("o.colors_0 = float4(0.0, 0.0, 0.0, 0.0);\n");
if (uid_data->numColorChans <= 1)
out.Write("o.colors_1 = float4(0.0, 0.0, 0.0, 0.0);\n");
VertexShaderGen: More per-pixel-lighting fixes.
2013-04-10 10:17:28 +00:00
}
Reformat all the things. Have fun with merge conflicts.
2016-06-24 08:43:46 +00:00
VideoCommon: Don't process the depth range in the vertex shader if it's not oversized.
2016-11-23 22:25:44 +00:00
// If we can disable the incorrect depth clipping planes using depth clamping, then we can do
Update comments
2016-12-27 19:25:46 +00:00
// our own depth clipping and calculate the depth range before the perspective divide if
// necessary.
ShaderGen: Pass host config to shader generation functions Also moves the host config checks to common.
2017-07-20 07:10:02 +00:00
if (host_config.backend_depth_clamp)
OGL: Check for GL_DEPTH_CLAMP support. It's not available in OpenGL ES and officially it's not supported on OpenGL 3.0/3.1. Fallback to old depth range code if there is no method to disable depth clipping. It's more important to have correct clipping than to have accurate depth values. Inaccurate depth values can be fixed by slow depth.
2016-08-05 20:31:34 +00:00
{
// Since we're adjusting z for the depth range before the perspective divide, we have to do our
Improve documentation.
2016-08-15 13:25:50 +00:00
// own clipping. We want to clip so that -w <= z <= 0, which matches the console -1..0 range.
VertexShaderGen: Move the sonic epsilon hack to the vertex shader. In the vertex shader we have control over the depth clipping planes, so we don't have to offset every floating point value and lose accuracy.
2016-08-30 23:54:05 +00:00
// We adjust our depth value for clipping purposes to match the perspective projection in the
// software backend, which is a hack to fix Sonic Adventure and Unleashed games.
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("float clipDepth = o.pos.z * (1.0 - 1e-7);\n"
"float clipDist0 = clipDepth + o.pos.w;\n" // Near: z < -w
"float clipDist1 = -clipDepth;\n"); // Far: z > 0
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
ShaderGen: Omit some unused varyings when possible Removes the clipPos varying unless slow-depth is used, and the clipDistance varyings if geometry shaders are not used.
2019-01-23 08:11:17 +00:00
if (host_config.backend_geometry_shaders)
{
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("o.clipDist0 = clipDist0;\n"
"o.clipDist1 = clipDist1;\n");
ShaderGen: Omit some unused varyings when possible Removes the clipPos varying unless slow-depth is used, and the clipDistance varyings if geometry shaders are not used.
2019-01-23 08:11:17 +00:00
}
VideoCommon: Don't process the depth range in the vertex shader if it's not oversized.
2016-11-23 22:25:44 +00:00
}
VertexShaderGen: Clip z using user-defined clipping planes.
2016-08-04 12:09:35 +00:00
VideoCommon: Don't process the depth range in the vertex shader if it's not oversized.
2016-11-23 22:25:44 +00:00
// Write the true depth value. If the game uses depth textures, then the pixel shader will
// override it with the correct values if not then early z culling will improve speed.
Update comments
2016-12-27 19:25:46 +00:00
// There are two different ways to do this, when the depth range is oversized, we process
// the depth range in the vertex shader, if not we let the host driver handle it.
VertexShaderGen: Remove the need for an extra UID.
2017-01-05 13:40:37 +00:00
//
// Adjust z for the depth range. We're using an equation which incorperates a depth inversion,
// so we can map the console -1..0 range to the 0..1 range used in the depth buffer.
// We have to handle the depth range in the vertex shader instead of after the perspective
// divide, because some games will use a depth range larger than what is allowed by the
// graphics API. These large depth ranges will still be clipped to the 0..1 range, so these
// games effectively add a depth bias to the values written to the depth buffer.
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("o.pos.z = o.pos.w * " I_PIXELCENTERCORRECTION ".w - "
"o.pos.z * " I_PIXELCENTERCORRECTION ".z;\n");
VideoCommon: Implement depth range equation in vertex shader.
2016-08-03 00:01:36 +00:00
ShaderGen: Pass host config to shader generation functions Also moves the host config checks to common.
2017-07-20 07:10:02 +00:00
if (!host_config.backend_clip_control)
Fixup line endings.
2011-09-29 19:52:13 +00:00
{
Improve documentation.
2016-08-15 13:25:50 +00:00
// If the graphics API doesn't support a depth range of 0..1, then we need to map z to
// the -1..1 range. Unfortunately we have to use a substraction, which is a lossy floating-point
// operation that can introduce a round-trip error.
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("o.pos.z = o.pos.z * 2.0 - o.pos.w;\n");
Fixup line endings.
2011-09-29 19:52:13 +00:00
}
Reformat all the things. Have fun with merge conflicts.
2016-06-24 08:43:46 +00:00
VertexShaderGen: Correct for negative viewport dimensions.
2017-03-16 11:33:51 +00:00
// Correct for negative viewports by mirroring all vertices. We need to negate the height here,
// since the viewport height is already negated by the render backend.
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("o.pos.xy *= sign(" I_PIXELCENTERCORRECTION ".xy * float2(1.0, -1.0));\n");
VertexShaderGen: Correct for negative viewport dimensions.
2017-03-16 11:33:51 +00:00
VertexShaderGen: Correct vertex shader output to consider shifted pixel centers. Fixes issue 267.
2014-04-23 21:42:28 +00:00
// The console GPU places the pixel center at 7/12 in screen space unless
// antialiasing is enabled, while D3D and OpenGL place it at 0.5. This results
// in some primitives being placed one pixel too far to the bottom-right,
// which in turn can be critical if it happens for clear quads.
// Hence, we compensate for this pixel center difference so that primitives
// get rasterized correctly.
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("o.pos.xy = o.pos.xy - o.pos.w * " I_PIXELCENTERCORRECTION ".xy;\n");
Reformat all the things. Have fun with merge conflicts.
2016-06-24 08:43:46 +00:00
ShaderGen: Remove host state from shader uids
2017-06-24 08:18:53 +00:00
if (vertex_rounding)
Add configurable toggle that rounds vertices to the nearest pixel when w=1. This fixes some games at higher IRs.
2017-02-19 00:22:41 +00:00
{
// By now our position is in clip space
// however, higher resolutions than the Wii outputs
// cause an additional pixel offset
// due to a higher pixel density
// we need to correct this by converting our
// clip-space position into the Wii's screen-space
// acquire the right pixel and then convert it back
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("if (o.pos.w == 1.0f)\n"
"{{\n"
Add configurable toggle that rounds vertices to the nearest pixel when w=1. This fixes some games at higher IRs.
2017-02-19 00:22:41 +00:00
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
"\tfloat ss_pixel_x = ((o.pos.x + 1.0f) * (" I_VIEWPORT_SIZE ".x * 0.5f));\n"
"\tfloat ss_pixel_y = ((o.pos.y + 1.0f) * (" I_VIEWPORT_SIZE ".y * 0.5f));\n"
Add configurable toggle that rounds vertices to the nearest pixel when w=1. This fixes some games at higher IRs.
2017-02-19 00:22:41 +00:00
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
"\tss_pixel_x = round(ss_pixel_x);\n"
"\tss_pixel_y = round(ss_pixel_y);\n"
Add configurable toggle that rounds vertices to the nearest pixel when w=1. This fixes some games at higher IRs.
2017-02-19 00:22:41 +00:00
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
"\to.pos.x = ((ss_pixel_x / (" I_VIEWPORT_SIZE ".x * 0.5f)) - 1.0f);\n"
"\to.pos.y = ((ss_pixel_y / (" I_VIEWPORT_SIZE ".y * 0.5f)) - 1.0f);\n"
"}}\n");
Add configurable toggle that rounds vertices to the nearest pixel when w=1. This fixes some games at higher IRs.
2017-02-19 00:22:41 +00:00
}
VideoCommon: Add APIType entry for Vulkan
2016-08-12 14:55:00 +00:00
if (api_type == APIType::OpenGL || api_type == APIType::Vulkan)
Add in GLSL setting again. PS and VS making. Untested and won't work for now. Add in program shader cache files. Readd NativeVertexFormat stuffs. Add in PS and VS cache things. SetShaders in places. Fixed EFB cache index computations in OpenGL renderer. The previous computation was very likely to go out of array bounds, which could result in crashes on EFB access. Also, the cache size was rounded down instead of up. This is a problem since EFB_HEIGHT (528) is not a multiple of EFB_CACHE_RECT_SIZE (64).
2011-12-01 03:00:21 +00:00
{
ShaderGen: Don't use interface blocks on Vulkan without GS Doing so causes the Adreno driver to choke and spew errors about too many output locations/components, when clearly we're under the limit.
2019-01-23 08:12:13 +00:00
if (host_config.backend_geometry_shaders)
VertexShaderGen: Don't read from output variables.
2014-12-22 02:36:39 +00:00
{
ShaderGen: Omit some unused varyings when possible Removes the clipPos varying unless slow-depth is used, and the clipDistance varyings if geometry shaders are not used.
2019-01-23 08:11:17 +00:00
AssignVSOutputMembers(out, "vs", "o", uid_data->numTexGens, host_config);
VertexShaderGen: Don't read from output variables.
2014-12-22 02:36:39 +00:00
}
else
VideoCommon: Don't pass structs between shader stages when geometry shaders are unsupported.
2014-12-17 22:44:05 +00:00
{
DriverDetails: Remove Intel Structs bug since it doesn't affect us anymore.
2014-12-22 01:47:31 +00:00
// TODO: Pass interface blocks between shader stages even if geometry shaders
// are not supported, however that will require at least OpenGL 3.2 support.
VertexShaderGen: Transition over to using fmt
2020-07-24 17:22:17 +00:00
for (u32 i = 0; i < uid_data->numTexGens; ++i)
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("tex{}.xyz = o.tex{};\n", i, i);
ShaderGen: Omit some unused varyings when possible Removes the clipPos varying unless slow-depth is used, and the clipDistance varyings if geometry shaders are not used.
2019-01-23 08:11:17 +00:00
if (!host_config.fast_depth_calc)
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("clipPos = o.clipPos;\n");
ShaderGen: Remove host state from shader uids
2017-06-24 08:18:53 +00:00
if (per_pixel_lighting)
Move worldpos into it's own varying. Previously it was packed into spare slots in clippos.xy and normal.w, but it's ugly and more importantly it's causing bugs. This was discovered during the debugging of a zfreeze branch, which expected clippos.xy to be xy position coordinates in clipspace (as the name suggested). Turns out the stereoscopy shader had also run into this trap, modifying clippos.x (introducing errors with per-pixel lighting). This commit has been moved outside of the zfreeze PR for fast merging.
2015-01-02 12:44:04 +00:00
{
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("Normal = o.Normal;\n"
"WorldPos = o.WorldPos;\n");
Move worldpos into it's own varying. Previously it was packed into spare slots in clippos.xy and normal.w, but it's ugly and more importantly it's causing bugs. This was discovered during the debugging of a zfreeze branch, which expected clippos.xy to be xy position coordinates in clipspace (as the name suggested). Turns out the stereoscopy shader had also run into this trap, modifying clippos.x (introducing errors with per-pixel lighting). This commit has been moved outside of the zfreeze PR for fast merging.
2015-01-02 12:44:04 +00:00
}
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("colors_0 = o.colors_0;\n"
"colors_1 = o.colors_1;\n");
VideoCommon: Don't pass structs between shader stages when geometry shaders are unsupported.
2014-12-17 22:44:05 +00:00
}
Reformat all the things. Have fun with merge conflicts.
2016-06-24 08:43:46 +00:00
ShaderGen: Pass host config to shader generation functions Also moves the host config checks to common.
2017-07-20 07:10:02 +00:00
if (host_config.backend_depth_clamp)
VideoCommon: Add a user-defined far clipping plane.
2016-08-12 13:06:26 +00:00
{
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("gl_ClipDistance[0] = clipDist0;\n"
"gl_ClipDistance[1] = clipDist1;\n");
VideoCommon: Add a user-defined far clipping plane.
2016-08-12 13:06:26 +00:00
}
VideoCommon: Add APIType entry for Vulkan
2016-08-12 14:55:00 +00:00
// Vulkan NDC space has Y pointing down (right-handed NDC space).
if (api_type == APIType::Vulkan)
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("gl_Position = float4(o.pos.x, -o.pos.y, o.pos.z, o.pos.w);\n");
VideoCommon: Add APIType entry for Vulkan
2016-08-12 14:55:00 +00:00
else
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("gl_Position = o.pos;\n");
Add in GLSL setting again. PS and VS making. Untested and won't work for now. Add in program shader cache files. Readd NativeVertexFormat stuffs. Add in PS and VS cache things. SetShaders in places. Fixed EFB cache index computations in OpenGL renderer. The previous computation was very likely to go out of array bounds, which could result in crashes on EFB access. Also, the cache size was rounded down instead of up. This is a problem since EFB_HEIGHT (528) is not a multiple of EFB_CACHE_RECT_SIZE (64).
2011-12-01 03:00:21 +00:00
}
Shader generators: Remove any references to D3D9 and cleanup the affected code.
2013-09-22 16:07:21 +00:00
else // D3D
Formatting cleanup for VideoCommon. Block braces on new lines. Also killed off trailing whitespace and dangling elses. Spaced some things out to make them more readable (only in places where it looked like a bit of a clusterfuck).
2013-04-24 13:21:54 +00:00
{
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("return o;\n");
Formatting cleanup for VideoCommon. Block braces on new lines. Also killed off trailing whitespace and dangling elses. Spaced some things out to make them more readable (only in places where it looked like a bit of a clusterfuck).
2013-04-24 13:21:54 +00:00
}
ShaderGenCommon: Rename WriteFmt() to Write() Now that we've converted all of the shader generators over to using fmt, we can drop the old Write() member function and perform a rename operation on the WriteFmt() to turn it into the new Write() function. All changes within this are the removal of a <cstdarg> header, since the previous printf-based Write() required it, and renaming. No functional changes are made at all.
2020-11-09 07:23:32 +00:00
out.Write("}}\n");
Reformat all the things. Have fun with merge conflicts.
2016-06-24 08:43:46 +00:00
VideoCommon: return code/uid from shader gens rather than passing in non-const references
2015-11-03 02:47:05 +00:00
return out;
Replace the shader uid system with a new one which quasi-automatically generates uids for shaders. Currently used in the vertex shader only (had to fork lighting shaders for now).
2012-08-06 20:41:30 +00:00
}