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

457 lines
17 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
Convert all includes to relative paths.
2014-02-17 10:18:15 +00:00
#include <cmath>
Fixup line endings.
2011-09-29 19:52:13 +00:00
Convert all includes to relative paths.
2014-02-17 10:18:15 +00:00
#include "VideoCommon/BPMemory.h"
#include "VideoCommon/CPMemory.h"
#include "VideoCommon/DriverDetails.h"
#include "VideoCommon/LightingShaderGen.h"
#include "VideoCommon/NativeVertexFormat.h"
#include "VideoCommon/VertexShaderGen.h"
#include "VideoCommon/VideoConfig.h"
Fixup line endings.
2011-09-29 19:52:13 +00:00
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
static char text[16768];
Fixup line endings.
2011-09-29 19:52:13 +00:00
ShaderGenCommon: Replace the GenOutput enum by using typeid instead.
2013-03-26 22:21:08 +00:00
template<class T>
LightingShaderGen: Use macro magic instead of snprintf. Should fix performance problems.
2013-08-12 10:52:42 +00:00
static inline void GenerateVertexShader(T& out, u32 components, API_TYPE api_type)
Fixup line endings.
2011-09-29 19:52:13 +00:00
{
ShaderGen: Cleanup uid data writing.
2013-03-29 20:53:57 +00:00
// Non-uid template parameters will write to the dummy data (=> gets optimized out)
vertex_shader_uid_data dummy_data;
Use pointers instead of references in GetUidData to avoid the undefined behavior of *(T *)nullptr (ewwww)
2014-10-21 06:52:45 +00:00
vertex_shader_uid_data* uid_data = out.template GetUidData<vertex_shader_uid_data>();
if (uid_data == nullptr)
uid_data = &dummy_data;
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
PixelShaderManager: Disable constant cache (won't work in the non-UBO path of the opengl backend). ShaderGen: Replace typeid usage with more general code.
2013-03-29 19:33:28 +00:00
out.SetBuffer(text);
clang-modernize -use-nullptr and s/\bNULL\b/nullptr/g for *.cpp/h/mm files not compiled on my machine
2014-03-09 20:14:26 +00:00
const bool is_writing_shadercode = (out.GetBuffer() != nullptr);
ShaderGen: Optimize out most function calls for uid generation.
2013-08-12 11:31:29 +00:00
if (is_writing_shadercode)
text[sizeof(text) - 1] = 0x7C; // canary
Fixup line endings.
2011-09-29 19:52:13 +00:00
Video backends: mass-replace "xfregs" with "xfmem".
2014-04-27 18:59:04 +00:00
_assert_(bpmem.genMode.numtexgens == xfmem.numTexGen.numTexGens);
_assert_(bpmem.genMode.numcolchans == xfmem.numChan.numColorChans);
Fixup line endings.
2011-09-29 19:52:13 +00:00
Fix OpenGLES 3.0 on Qualcomm's crappy driver, it can't bitshift sometimes. [fixed lint issues and grammar ~comex]
2015-02-28 20:02:44 +00:00
if (DriverDetails::HasBug(DriverDetails::BUG_BROKENIVECSHIFTS))
{
// Add functions to do shifts on scalars and ivecs.
// This is included in the vertex shader for lighting shader generation.
out.Write("int ilshift(int a, int b) { return a << b; }\n"
"int irshift(int a, int b) { return a >> b; }\n"
"int2 ilshift(int2 a, int2 b) { return int2(a.x << b.x, a.y << b.y); }\n"
"int2 ilshift(int2 a, int b) { return int2(a.x << b, a.y << b); }\n"
"int2 irshift(int2 a, int2 b) { return int2(a.x >> b.x, a.y >> b.y); }\n"
"int2 irshift(int2 a, int b) { return int2(a.x >> b, a.y >> b); }\n"
"int3 ilshift(int3 a, int3 b) { return int3(a.x << b.x, a.y << b.y, a.z << b.z); }\n"
"int3 ilshift(int3 a, int b) { return int3(a.x << b, a.y << b, a.z << b); }\n"
"int3 irshift(int3 a, int3 b) { return int3(a.x >> b.x, a.y >> b.y, a.z >> b.z); }\n"
"int3 irshift(int3 a, int b) { return int3(a.x >> b, a.y >> b, a.z >> b); }\n"
"int4 ilshift(int4 a, int4 b) { return int4(a.x << b.x, a.y << b.y, a.z << b.z, a.w << b.w); }\n"
"int4 ilshift(int4 a, int b) { return int4(a.x << b, a.y << b, a.z << b, a.w << b); }\n"
"int4 irshift(int4 a, int4 b) { return int4(a.x >> b.x, a.y >> b.y, a.z >> b.z, a.w >> b.w); }\n"
"int4 irshift(int4 a, int b) { return int4(a.x >> b, a.y >> b, a.z >> b, a.w >> b); }\n\n");
}
LightingShader: hard code const variable
2014-05-30 14:17:30 +00:00
out.Write("%s", s_lighting_struct);
Fixup line endings.
2011-09-29 19:52:13 +00:00
// uniforms
OGL: remove ubo workaround This was only keeped for some broken mesa versions. Meanwhile most used versions should be fixed for almost a year.
2014-01-30 15:38:11 +00:00
if (api_type == API_OPENGL)
Add initial support for GLSL ES 3.10. GLSL ES 3.10 adds implicit support for the binding layout qualifier that we use. Changes our GLSL version enums to bit values so we can check for both ES versions easily.
2014-03-30 18:58:05 +00:00
out.Write("layout(std140%s) uniform VSBlock {\n", g_ActiveConfig.backend_info.bSupportsBindingLayout ? ", binding = 2" : "");
ShaderGen: use cbuffers for D3D
2014-03-17 09:19:54 +00:00
else
out.Write("cbuffer VSBlock {\n");
ShaderGenCommon: Move uniforms into a common static string.
2014-10-29 13:15:12 +00:00
out.Write(s_shader_uniforms);
out.Write("};\n");
Fixup line endings.
2011-09-29 19:52:13 +00:00
VideoCommon: Don't pass structs between shaders, use the interface blocks instead.
2014-12-21 11:52:14 +00:00
out.Write("struct VS_OUTPUT {\n");
GenerateVSOutputMembers<T>(out, api_type);
out.Write("};\n");
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
Use pointers instead of references in GetUidData to avoid the undefined behavior of *(T *)nullptr (ewwww)
2014-10-21 06:52:45 +00:00
uid_data->numTexGens = xfmem.numTexGen.numTexGens;
uid_data->components = components;
uid_data->pixel_lighting = g_ActiveConfig.bEnablePixelLighting;
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
Fixes spacing for "for", "while", "switch" and "if" Also moved && and || to ends of lines instead of start. Fixed misc vertical alignments and some { needed newlining.
2014-03-10 11:30:55 +00:00
if (api_type == API_OPENGL)
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
{
remove (ATTR|VARY)(IN|OUT) macros
2014-02-25 14:52:22 +00:00
out.Write("in float4 rawpos; // ATTR%d,\n", SHADER_POSITION_ATTRIB);
remove glsl binding support. convert every shader to version 130
2013-01-02 15:56:08 +00:00
if (components & VB_HAS_POSMTXIDX)
Changes posmtx vertex attribute to integer. This makes it so we don't need to do some dumb casting from float to integer in our shaders. Only tested in OpenGL, needs to be tested in D3D.
2014-04-24 07:30:05 +00:00
out.Write("in int posmtx; // ATTR%d,\n", SHADER_POSMTX_ATTRIB);
use attrib pointers in nativeVertexFormat
2013-01-14 21:59:08 +00:00
if (components & VB_HAS_NRM0)
remove (ATTR|VARY)(IN|OUT) macros
2014-02-25 14:52:22 +00:00
out.Write("in float3 rawnorm0; // ATTR%d,\n", SHADER_NORM0_ATTRIB);
remove glsl binding support. convert every shader to version 130
2013-01-02 15:56:08 +00:00
if (components & VB_HAS_NRM1)
remove (ATTR|VARY)(IN|OUT) macros
2014-02-25 14:52:22 +00:00
out.Write("in float3 rawnorm1; // ATTR%d,\n", SHADER_NORM1_ATTRIB);
remove glsl binding support. convert every shader to version 130
2013-01-02 15:56:08 +00:00
if (components & VB_HAS_NRM2)
remove (ATTR|VARY)(IN|OUT) macros
2014-02-25 14:52:22 +00:00
out.Write("in float3 rawnorm2; // ATTR%d,\n", SHADER_NORM2_ATTRIB);
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
if (components & VB_HAS_COL0)
remove (ATTR|VARY)(IN|OUT) macros
2014-02-25 14:52:22 +00:00
out.Write("in float4 color0; // ATTR%d,\n", SHADER_COLOR0_ATTRIB);
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
if (components & VB_HAS_COL1)
remove (ATTR|VARY)(IN|OUT) macros
2014-02-25 14:52:22 +00:00
out.Write("in float4 color1; // ATTR%d,\n", SHADER_COLOR1_ATTRIB);
Clean up more space/tab mismatches in AudioCommon, Common, and VideoCommon. Not planning to touch Core since it's the most actively changed part of the project.
2013-03-20 01:51:12 +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
for (int i = 0; i < 8; ++i)
{
Give OSX users more of a chance of supporting Single pass DSB in the future.
2011-12-21 07:29:29 +00:00
u32 hastexmtx = (components & (VB_HAS_TEXMTXIDX0<<i));
if ((components & (VB_HAS_UV0<<i)) || hastexmtx)
remove (ATTR|VARY)(IN|OUT) macros
2014-02-25 14:52:22 +00:00
out.Write("in float%d tex%d; // ATTR%d,\n", hastexmtx ? 3 : 2, i, SHADER_TEXTURE0_ATTRIB + 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
}
Change 'stuff'
2012-01-11 07:18:54 +00:00
VideoCommon: Only use interface blocks when geometry shaders are supported.
2014-12-17 08:18:40 +00:00
if (g_ActiveConfig.backend_info.bSupportsGeometryShaders)
{
VideoCommon: Don't pass structs between shaders, use the interface blocks instead.
2014-12-21 11:52:14 +00:00
out.Write("out VertexData {\n");
GenerateVSOutputMembers<T>(out, api_type, g_ActiveConfig.backend_info.bSupportsBindingLayout ? "centroid" : "centroid out");
VertexShaderGen: Don't read from output variables.
2014-12-22 02:36:39 +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
for (size_t i = 0; i < 8; ++i)
{
if (i < xfmem.numTexGen.numTexGens)
{
out.Write("centroid out float3 uv%d;\n", i);
}
}
out.Write("centroid out float4 clipPos;\n");
if (g_ActiveConfig.bEnablePixelLighting)
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
{
out.Write("centroid out float3 Normal;\n");
out.Write("centroid out float3 WorldPos;\n");
}
PixelShaderGen: Don't assign to input variables.
2014-12-25 23:56:12 +00:00
out.Write("centroid out float4 colors_0;\n");
out.Write("centroid out float4 colors_1;\n");
VideoCommon: Only use interface blocks when geometry shaders are supported.
2014-12-17 08:18:40 +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
Merge 'master' into shader-uids-awesome. Conflicts: Source/Core/VideoCommon/Src/LightingShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.h Source/Core/VideoCommon/Src/PixelShaderManager.cpp Source/Core/VideoCommon/Src/VertexShaderGen.cpp Source/Core/VideoCommon/Src/VertexShaderGen.h Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h
2013-03-26 21:16:29 +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
{
Merge 'master' into shader-uids-awesome. Conflicts: Source/Core/VideoCommon/Src/LightingShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.h Source/Core/VideoCommon/Src/PixelShaderManager.cpp Source/Core/VideoCommon/Src/VertexShaderGen.cpp Source/Core/VideoCommon/Src/VertexShaderGen.h Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h
2013-03-26 21:16:29 +00:00
out.Write("VS_OUTPUT main(\n");
Clean up more space/tab mismatches in AudioCommon, Common, and VideoCommon. Not planning to touch Core since it's the most actively changed part of the project.
2013-03-20 01:51:12 +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
if (components & VB_HAS_NRM0)
Merge 'master' into shader-uids-awesome. Conflicts: Source/Core/VideoCommon/Src/LightingShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.h Source/Core/VideoCommon/Src/PixelShaderManager.cpp Source/Core/VideoCommon/Src/VertexShaderGen.cpp Source/Core/VideoCommon/Src/VertexShaderGen.h Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h
2013-03-26 21:16:29 +00:00
out.Write(" float3 rawnorm0 : NORMAL0,\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
if (components & VB_HAS_NRM1)
VertexShaderGen: Cleanup.
2013-08-14 11:47:23 +00:00
out.Write(" float3 rawnorm1 : NORMAL1,\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
if (components & VB_HAS_NRM2)
VertexShaderGen: Cleanup.
2013-08-14 11:47:23 +00:00
out.Write(" float3 rawnorm2 : NORMAL2,\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
if (components & VB_HAS_COL0)
Merge 'master' into shader-uids-awesome. Conflicts: Source/Core/VideoCommon/Src/LightingShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.h Source/Core/VideoCommon/Src/PixelShaderManager.cpp Source/Core/VideoCommon/Src/VertexShaderGen.cpp Source/Core/VideoCommon/Src/VertexShaderGen.h Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h
2013-03-26 21:16:29 +00:00
out.Write(" float4 color0 : COLOR0,\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
if (components & VB_HAS_COL1)
Merge 'master' into shader-uids-awesome. Conflicts: Source/Core/VideoCommon/Src/LightingShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.h Source/Core/VideoCommon/Src/PixelShaderManager.cpp Source/Core/VideoCommon/Src/VertexShaderGen.cpp Source/Core/VideoCommon/Src/VertexShaderGen.h Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h
2013-03-26 21:16:29 +00:00
out.Write(" float4 color1 : COLOR1,\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
for (int i = 0; i < 8; ++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
u32 hastexmtx = (components & (VB_HAS_TEXMTXIDX0<<i));
if ((components & (VB_HAS_UV0<<i)) || hastexmtx)
Merge 'master' into shader-uids-awesome. Conflicts: Source/Core/VideoCommon/Src/LightingShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.h Source/Core/VideoCommon/Src/PixelShaderManager.cpp Source/Core/VideoCommon/Src/VertexShaderGen.cpp Source/Core/VideoCommon/Src/VertexShaderGen.h Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h
2013-03-26 21:16:29 +00:00
out.Write(" float%d tex%d : TEXCOORD%d,\n", hastexmtx ? 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
}
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
if (components & VB_HAS_POSMTXIDX)
Changes posmtx vertex attribute to integer. This makes it so we don't need to do some dumb casting from float to integer in our shaders. Only tested in OpenGL, needs to be tested in D3D.
2014-04-24 07:30:05 +00:00
out.Write(" int posmtx : BLENDINDICES,\n");
Merge 'master' into shader-uids-awesome. Conflicts: Source/Core/VideoCommon/Src/LightingShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.h Source/Core/VideoCommon/Src/PixelShaderManager.cpp Source/Core/VideoCommon/Src/VertexShaderGen.cpp Source/Core/VideoCommon/Src/VertexShaderGen.h Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h
2013-03-26 21:16:29 +00:00
out.Write(" float4 rawpos : POSITION) {\n");
Fixup line endings.
2011-09-29 19:52:13 +00:00
}
VertexShaderGen: Don't read from output variables.
2014-12-22 02:36:39 +00:00
out.Write("VS_OUTPUT o;\n");
Fixup line endings.
2011-09-29 19:52:13 +00:00
// transforms
if (components & VB_HAS_POSMTXIDX)
{
Formatting/Whitespace Cleanup Various fixes to formatting and whitespace
2015-02-15 19:43:31 +00:00
if (is_writing_shadercode && (DriverDetails::HasBug(DriverDetails::BUG_NODYNUBOACCESS) && !DriverDetails::HasBug(DriverDetails::BUG_ANNIHILATEDUBOS)))
[Android] Start of *working* GLES3 support. Needs to be able to compile in Windows still.
2013-06-11 13:33:56 +00:00
{
// This'll cause issues, but it can't be helped
Merge 'master' into shader-uids-awesome. Conflicts: Source/Core/VideoCommon/Src/LightingShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.h Source/Core/VideoCommon/Src/VertexShaderGen.cpp
2013-06-17 10:05:47 +00:00
out.Write("float4 pos = float4(dot(" I_TRANSFORMMATRICES"[0], rawpos), dot(" I_TRANSFORMMATRICES"[1], rawpos), dot(" I_TRANSFORMMATRICES"[2], rawpos), 1);\n");
if (components & VB_HAS_NRMALL)
out.Write("float3 N0 = " I_NORMALMATRICES"[0].xyz, N1 = " I_NORMALMATRICES"[1].xyz, N2 = " I_NORMALMATRICES"[2].xyz;\n");
Fixup line endings.
2011-09-29 19:52:13 +00:00
}
[Android] Start of *working* GLES3 support. Needs to be able to compile in Windows still.
2013-06-11 13:33:56 +00:00
else
{
Merge 'master' into shader-uids-awesome. Conflicts: Source/Core/VideoCommon/Src/LightingShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.h Source/Core/VideoCommon/Src/VertexShaderGen.cpp
2013-06-17 10:05:47 +00:00
out.Write("float4 pos = float4(dot(" I_TRANSFORMMATRICES"[posmtx], rawpos), dot(" I_TRANSFORMMATRICES"[posmtx+1], rawpos), dot(" I_TRANSFORMMATRICES"[posmtx+2], rawpos), 1);\n");
Fixup line endings.
2011-09-29 19:52:13 +00:00
VideoCommon: Clean up brace placements
2014-08-30 20:51:27 +00:00
if (components & VB_HAS_NRMALL)
{
Merge 'master' into shader-uids-awesome. Conflicts: Source/Core/VideoCommon/Src/LightingShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.h Source/Core/VideoCommon/Src/VertexShaderGen.cpp
2013-06-17 10:05:47 +00:00
out.Write("int normidx = posmtx >= 32 ? (posmtx-32) : posmtx;\n");
out.Write("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
}
}
VideoCommon: Clean up brace placements
2014-08-30 20:51:27 +00:00
Fixup line endings.
2011-09-29 19:52:13 +00:00
if (components & VB_HAS_NRM0)
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
out.Write("float3 _norm0 = normalize(float3(dot(N0, rawnorm0), dot(N1, rawnorm0), dot(N2, rawnorm0)));\n");
Fixup line endings.
2011-09-29 19:52:13 +00:00
if (components & VB_HAS_NRM1)
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
out.Write("float3 _norm1 = float3(dot(N0, rawnorm1), dot(N1, rawnorm1), dot(N2, rawnorm1));\n");
Fixup line endings.
2011-09-29 19:52:13 +00:00
if (components & VB_HAS_NRM2)
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
out.Write("float3 _norm2 = float3(dot(N0, rawnorm2), dot(N1, rawnorm2), dot(N2, rawnorm2));\n");
Fixup line endings.
2011-09-29 19:52:13 +00:00
}
else
{
[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
out.Write("float4 pos = float4(dot(" I_POSNORMALMATRIX"[0], rawpos), dot(" I_POSNORMALMATRIX"[1], rawpos), dot(" I_POSNORMALMATRIX"[2], rawpos), 1.0);\n");
Fixup line endings.
2011-09-29 19:52:13 +00:00
if (components & VB_HAS_NRM0)
Merge 'master' into shader-uids-awesome. Conflicts: Source/Core/VideoCommon/Src/LightingShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.h Source/Core/VideoCommon/Src/PixelShaderManager.cpp Source/Core/VideoCommon/Src/VertexShaderGen.cpp Source/Core/VideoCommon/Src/VertexShaderGen.h Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h
2013-03-26 21:16:29 +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");
Fixup line endings.
2011-09-29 19:52:13 +00:00
if (components & VB_HAS_NRM1)
Merge 'master' into shader-uids-awesome. Conflicts: Source/Core/VideoCommon/Src/LightingShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.h Source/Core/VideoCommon/Src/PixelShaderManager.cpp Source/Core/VideoCommon/Src/VertexShaderGen.cpp Source/Core/VideoCommon/Src/VertexShaderGen.h Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h
2013-03-26 21:16:29 +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");
Fixup line endings.
2011-09-29 19:52:13 +00:00
if (components & VB_HAS_NRM2)
Merge 'master' into shader-uids-awesome. Conflicts: Source/Core/VideoCommon/Src/LightingShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.h Source/Core/VideoCommon/Src/PixelShaderManager.cpp Source/Core/VideoCommon/Src/VertexShaderGen.cpp Source/Core/VideoCommon/Src/VertexShaderGen.h Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h
2013-03-26 21:16:29 +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");
Fixup line endings.
2011-09-29 19:52:13 +00:00
}
if (!(components & VB_HAS_NRM0))
[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
out.Write("float3 _norm0 = float3(0.0, 0.0, 0.0);\n");
Fixup line endings.
2011-09-29 19:52:13 +00:00
Merge 'master' into shader-uids-awesome. Conflicts: Source/Core/VideoCommon/Src/LightingShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.h Source/Core/VideoCommon/Src/PixelShaderManager.cpp Source/Core/VideoCommon/Src/VertexShaderGen.cpp Source/Core/VideoCommon/Src/VertexShaderGen.h Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h
2013-03-26 21:16:29 +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");
Fixup line endings.
2011-09-29 19:52:13 +00:00
LightingShaderGen: Perform more lighting calculations with integers.
2013-10-27 13:43:29 +00:00
out.Write("int4 lacc;\n"
Lighting Attenuation Fixes
2015-01-21 22:55:32 +00:00
"float3 ldir, h, cosAttn, distAttn;\n"
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
"float dist, dist2, attn;\n");
Use pointers instead of references in GetUidData to avoid the undefined behavior of *(T *)nullptr (ewwww)
2014-10-21 06:52:45 +00:00
uid_data->numColorChans = xfmem.numChan.numColorChans;
Video backends: mass-replace "xfregs" with "xfmem".
2014-04-27 18:59:04 +00:00
if (xfmem.numChan.numColorChans == 0)
Fixup line endings.
2011-09-29 19:52:13 +00:00
{
if (components & VB_HAS_COL0)
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
out.Write("o.colors_0 = color0;\n");
Fixup line endings.
2011-09-29 19:52:13 +00:00
else
[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
out.Write("o.colors_0 = float4(1.0, 1.0, 1.0, 1.0);\n");
Fixup line endings.
2011-09-29 19:52:13 +00:00
}
Use pointers instead of references in GetUidData to avoid the undefined behavior of *(T *)nullptr (ewwww)
2014-10-21 06:52:45 +00:00
GenerateLightingShader<T>(out, uid_data->lighting, components, "color", "o.colors_");
Fixup line endings.
2011-09-29 19:52:13 +00:00
Video backends: mass-replace "xfregs" with "xfmem".
2014-04-27 18:59:04 +00:00
if (xfmem.numChan.numColorChans < 2)
Fixup line endings.
2011-09-29 19:52:13 +00:00
{
if (components & VB_HAS_COL1)
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
out.Write("o.colors_1 = color1;\n");
Fixup line endings.
2011-09-29 19:52:13 +00:00
else
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
out.Write("o.colors_1 = o.colors_0;\n");
Fixup line endings.
2011-09-29 19:52:13 +00:00
}
// special case if only pos and tex coord 0 and tex coord input is AB11
// donko - this has caused problems in some games. removed for now.
bool texGenSpecialCase = false;
/*bool texGenSpecialCase =
Mechanical changes to move most CP state to a struct rather than separate globals. The next commit will add a separate copy of the struct and the ability for LoadCPReg to work on it.
2014-08-27 17:26:06 +00:00
((g_main_cp_state.vtx_desc.Hex & 0x60600L) == g_main_cp_state.vtx_desc.Hex) && // only pos and tex coord 0
(g_main_cp_state.vtx_desc.Tex0Coord != NOT_PRESENT) &&
Video backends: mass-replace "xfregs" with "xfmem".
2014-04-27 18:59:04 +00:00
(xfmem.texcoords[0].texmtxinfo.inputform == XF_TEXINPUT_AB11);
Fixup line endings.
2011-09-29 19:52:13 +00:00
*/
// transform texcoords
[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
out.Write("float4 coord = float4(0.0, 0.0, 1.0, 1.0);\n");
Video backends: mass-replace "xfregs" with "xfmem".
2014-04-27 18:59:04 +00:00
for (unsigned int i = 0; i < xfmem.numTexGen.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
{
Video backends: mass-replace "xfregs" with "xfmem".
2014-04-27 18:59:04 +00:00
TexMtxInfo& texinfo = xfmem.texMtxInfo[i];
Fixup line endings.
2011-09-29 19:52:13 +00:00
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
out.Write("{\n");
[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
out.Write("coord = float4(0.0, 0.0, 1.0, 1.0);\n");
Use pointers instead of references in GetUidData to avoid the undefined behavior of *(T *)nullptr (ewwww)
2014-10-21 06:52:45 +00:00
uid_data->texMtxInfo[i].sourcerow = xfmem.texMtxInfo[i].sourcerow;
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)
{
Fixup line endings.
2011-09-29 19:52:13 +00:00
case XF_SRCGEOM_INROW:
Formatting/Whitespace Cleanup Various fixes to formatting and whitespace
2015-02-15 19:43:31 +00:00
_assert_(texinfo.inputform == XF_TEXINPUT_ABC1);
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
out.Write("coord = rawpos;\n"); // pos.w is 1
Fixup line endings.
2011-09-29 19:52:13 +00:00
break;
case XF_SRCNORMAL_INROW:
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
if (components & VB_HAS_NRM0)
{
Formatting/Whitespace Cleanup Various fixes to formatting and whitespace
2015-02-15 19:43:31 +00:00
_assert_(texinfo.inputform == XF_TEXINPUT_ABC1);
[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
out.Write("coord = float4(rawnorm0.xyz, 1.0);\n");
Fixup line endings.
2011-09-29 19:52:13 +00:00
}
break;
case XF_SRCCOLORS_INROW:
Formatting/Whitespace Cleanup Various fixes to formatting and whitespace
2015-02-15 19:43:31 +00:00
_assert_(texinfo.texgentype == XF_TEXGEN_COLOR_STRGBC0 || texinfo.texgentype == XF_TEXGEN_COLOR_STRGBC1);
Fixup line endings.
2011-09-29 19:52:13 +00:00
break;
case XF_SRCBINORMAL_T_INROW:
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
if (components & VB_HAS_NRM1)
{
Formatting/Whitespace Cleanup Various fixes to formatting and whitespace
2015-02-15 19:43:31 +00:00
_assert_(texinfo.inputform == XF_TEXINPUT_ABC1);
[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
out.Write("coord = float4(rawnorm1.xyz, 1.0);\n");
Fixup line endings.
2011-09-29 19:52:13 +00:00
}
break;
case XF_SRCBINORMAL_B_INROW:
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
if (components & VB_HAS_NRM2)
{
Formatting/Whitespace Cleanup Various fixes to formatting and whitespace
2015-02-15 19:43:31 +00:00
_assert_(texinfo.inputform == XF_TEXINPUT_ABC1);
[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
out.Write("coord = float4(rawnorm2.xyz, 1.0);\n");
Fixup line endings.
2011-09-29 19:52:13 +00:00
}
break;
default:
_assert_(texinfo.sourcerow <= XF_SRCTEX7_INROW);
Formatting/Whitespace Cleanup Various fixes to formatting and whitespace
2015-02-15 19:43:31 +00:00
if (components & (VB_HAS_UV0 << (texinfo.sourcerow - XF_SRCTEX0_INROW)))
[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
out.Write("coord = float4(tex%d.x, tex%d.y, 1.0, 1.0);\n", texinfo.sourcerow - XF_SRCTEX0_INROW, texinfo.sourcerow - XF_SRCTEX0_INROW);
Fixup line endings.
2011-09-29 19:52:13 +00:00
break;
}
// first transformation
Use pointers instead of references in GetUidData to avoid the undefined behavior of *(T *)nullptr (ewwww)
2014-10-21 06:52:45 +00:00
uid_data->texMtxInfo[i].texgentype = xfmem.texMtxInfo[i].texgentype;
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)
{
Fixup line endings.
2011-09-29 19:52:13 +00:00
case XF_TEXGEN_EMBOSS_MAP: // calculate tex coords into bump map
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
if (components & (VB_HAS_NRM1|VB_HAS_NRM2))
{
Fixup line endings.
2011-09-29 19:52:13 +00:00
// transform the light dir into tangent space
Use pointers instead of references in GetUidData to avoid the undefined behavior of *(T *)nullptr (ewwww)
2014-10-21 06:52:45 +00:00
uid_data->texMtxInfo[i].embosslightshift = xfmem.texMtxInfo[i].embosslightshift;
uid_data->texMtxInfo[i].embosssourceshift = xfmem.texMtxInfo[i].embosssourceshift;
LightingShader: hard code const variable
2014-05-30 14:17:30 +00:00
out.Write("ldir = normalize(" LIGHT_POS".xyz - pos.xyz);\n", LIGHT_POS_PARAMS(texinfo.embosslightshift));
[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
out.Write("o.tex%d.xyz = o.tex%d.xyz + float3(dot(ldir, _norm1), dot(ldir, _norm2), 0.0);\n", i, texinfo.embosssourceshift);
Fixup line endings.
2011-09-29 19:52:13 +00:00
}
else
{
_assert_(0); // should have normals
Use pointers instead of references in GetUidData to avoid the undefined behavior of *(T *)nullptr (ewwww)
2014-10-21 06:52:45 +00:00
uid_data->texMtxInfo[i].embosssourceshift = xfmem.texMtxInfo[i].embosssourceshift;
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
out.Write("o.tex%d.xyz = o.tex%d.xyz;\n", i, texinfo.embosssourceshift);
Fixup line endings.
2011-09-29 19:52:13 +00:00
}
break;
case XF_TEXGEN_COLOR_STRGBC0:
_assert_(texinfo.sourcerow == XF_SRCCOLORS_INROW);
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
out.Write("o.tex%d.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;
case XF_TEXGEN_COLOR_STRGBC1:
_assert_(texinfo.sourcerow == XF_SRCCOLORS_INROW);
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
out.Write("o.tex%d.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;
case XF_TEXGEN_REGULAR:
default:
Use pointers instead of references in GetUidData to avoid the undefined behavior of *(T *)nullptr (ewwww)
2014-10-21 06:52:45 +00:00
uid_data->texMtxInfo_n_projection |= xfmem.texMtxInfo[i].projection << i;
Now CG plays nice with this new stuff.
2011-12-01 06:33:12 +00:00
if (components & (VB_HAS_TEXMTXIDX0<<i))
{
Merge 'master' into shader-uids-awesome. Conflicts: Source/Core/VideoCommon/Src/LightingShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.h Source/Core/VideoCommon/Src/PixelShaderManager.cpp Source/Core/VideoCommon/Src/VertexShaderGen.cpp Source/Core/VideoCommon/Src/VertexShaderGen.h Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h
2013-03-26 21:16:29 +00:00
out.Write("int tmp = int(tex%d.z);\n", i);
Fixup line endings.
2011-09-29 19:52:13 +00:00
if (texinfo.projection == XF_TEXPROJ_STQ)
Merge 'master' into shader-uids-awesome. Conflicts: Source/Core/VideoCommon/Src/LightingShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.h Source/Core/VideoCommon/Src/PixelShaderManager.cpp Source/Core/VideoCommon/Src/VertexShaderGen.cpp Source/Core/VideoCommon/Src/VertexShaderGen.h Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h
2013-03-26 21:16:29 +00:00
out.Write("o.tex%d.xyz = float3(dot(coord, " I_TRANSFORMMATRICES"[tmp]), dot(coord, " I_TRANSFORMMATRICES"[tmp+1]), dot(coord, " I_TRANSFORMMATRICES"[tmp+2]));\n", 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
else
Merge 'master' into shader-uids-awesome. Conflicts: Source/Core/VideoCommon/Src/LightingShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.h Source/Core/VideoCommon/Src/PixelShaderManager.cpp Source/Core/VideoCommon/Src/VertexShaderGen.cpp Source/Core/VideoCommon/Src/VertexShaderGen.h Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h
2013-03-26 21:16:29 +00:00
out.Write("o.tex%d.xyz = float3(dot(coord, " I_TRANSFORMMATRICES"[tmp]), dot(coord, " I_TRANSFORMMATRICES"[tmp+1]), 1);\n", i);
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
{
Fixup line endings.
2011-09-29 19:52:13 +00:00
if (texinfo.projection == XF_TEXPROJ_STQ)
Merge 'master' into shader-uids-awesome. Conflicts: Source/Core/VideoCommon/Src/LightingShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.h Source/Core/VideoCommon/Src/PixelShaderManager.cpp Source/Core/VideoCommon/Src/VertexShaderGen.cpp Source/Core/VideoCommon/Src/VertexShaderGen.h Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h
2013-03-26 21:16:29 +00:00
out.Write("o.tex%d.xyz = float3(dot(coord, " I_TEXMATRICES"[%d]), dot(coord, " I_TEXMATRICES"[%d]), dot(coord, " I_TEXMATRICES"[%d]));\n", i, 3*i, 3*i+1, 3*i+2);
Fixup line endings.
2011-09-29 19:52:13 +00:00
else
Merge 'master' into shader-uids-awesome. Conflicts: Source/Core/VideoCommon/Src/LightingShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.h Source/Core/VideoCommon/Src/PixelShaderManager.cpp Source/Core/VideoCommon/Src/VertexShaderGen.cpp Source/Core/VideoCommon/Src/VertexShaderGen.h Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h
2013-03-26 21:16:29 +00:00
out.Write("o.tex%d.xyz = float3(dot(coord, " I_TEXMATRICES"[%d]), dot(coord, " I_TEXMATRICES"[%d]), 1);\n", i, 3*i, 3*i+1);
Fixup line endings.
2011-09-29 19:52:13 +00:00
}
break;
}
Use pointers instead of references in GetUidData to avoid the undefined behavior of *(T *)nullptr (ewwww)
2014-10-21 06:52:45 +00:00
uid_data->dualTexTrans_enabled = xfmem.dualTexTrans.enabled;
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?
Video backends: mass-replace "xfregs" with "xfmem".
2014-04-27 18:59:04 +00:00
if (xfmem.dualTexTrans.enabled && texinfo.texgentype == XF_TEXGEN_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
{
Video backends: mass-replace "xfregs" with "xfmem".
2014-04-27 18:59:04 +00:00
const PostMtxInfo& postInfo = xfmem.postMtxInfo[i];
Fixup line endings.
2011-09-29 19:52:13 +00:00
Use pointers instead of references in GetUidData to avoid the undefined behavior of *(T *)nullptr (ewwww)
2014-10-21 06:52:45 +00:00
uid_data->postMtxInfo[i].index = xfmem.postMtxInfo[i].index;
Fixup line endings.
2011-09-29 19:52:13 +00:00
int postidx = postInfo.index;
Merge 'master' into shader-uids-awesome. Conflicts: Source/Core/VideoCommon/Src/LightingShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.h Source/Core/VideoCommon/Src/PixelShaderManager.cpp Source/Core/VideoCommon/Src/VertexShaderGen.cpp Source/Core/VideoCommon/Src/VertexShaderGen.h Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h
2013-03-26 21:16:29 +00:00
out.Write("float4 P0 = " I_POSTTRANSFORMMATRICES"[%d];\n"
fix gcc compilation
2012-12-19 22:42:22 +00:00
"float4 P1 = " I_POSTTRANSFORMMATRICES"[%d];\n"
"float4 P2 = " I_POSTTRANSFORMMATRICES"[%d];\n",
Formatting/Whitespace Cleanup Various fixes to formatting and whitespace
2015-02-15 19:43:31 +00:00
postidx & 0x3f, (postidx + 1) & 0x3f, (postidx + 2) & 0x3f);
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
if (texGenSpecialCase)
{
Fixup line endings.
2011-09-29 19:52:13 +00:00
// no normalization
// q of input is 1
// q of output is unknown
// multiply by postmatrix
[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
out.Write("o.tex%d.xyz = float3(dot(P0.xy, o.tex%d.xy) + P0.z + P0.w, dot(P1.xy, o.tex%d.xy) + P1.z + P1.w, 0.0);\n", i, i, i);
Fixup line endings.
2011-09-29 19:52:13 +00:00
}
else
{
Use pointers instead of references in GetUidData to avoid the undefined behavior of *(T *)nullptr (ewwww)
2014-10-21 06:52:45 +00:00
uid_data->postMtxInfo[i].normalize = xfmem.postMtxInfo[i].normalize;
Fixup line endings.
2011-09-29 19:52:13 +00:00
if (postInfo.normalize)
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
out.Write("o.tex%d.xyz = normalize(o.tex%d.xyz);\n", i, i);
Fixup line endings.
2011-09-29 19:52:13 +00:00
// multiply by postmatrix
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
out.Write("o.tex%d.xyz = float3(dot(P0.xyz, o.tex%d.xyz) + P0.w, dot(P1.xyz, o.tex%d.xyz) + P1.w, dot(P2.xyz, o.tex%d.xyz) + P2.w);\n", i, i, i, i);
Fixup line endings.
2011-09-29 19:52:13 +00:00
}
}
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
out.Write("}\n");
Fixup line endings.
2011-09-29 19:52:13 +00:00
}
// clipPos/w needs to be done in pixel shader, not here
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
out.Write("o.clipPos = o.pos;\n");
Fixup line endings.
2011-09-29 19:52:13 +00:00
VideoBackend: remove unused config vars. No point to keeping around variables which are always "true".
2014-04-04 23:17:14 +00:00
if (g_ActiveConfig.bEnablePixelLighting)
Fixup line endings.
2011-09-29 19:52:13 +00:00
{
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
out.Write("o.Normal = _norm0;\n");
out.Write("o.WorldPos = pos.xyz;\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
Fixup line endings.
2011-09-29 19:52:13 +00:00
if (components & VB_HAS_COL0)
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
out.Write("o.colors_0 = color0;\n");
Fixup line endings.
2011-09-29 19:52:13 +00:00
if (components & VB_HAS_COL1)
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
out.Write("o.colors_1 = color1;\n");
VertexShaderGen: More per-pixel-lighting fixes.
2013-04-10 10:17:28 +00:00
}
Fixup line endings.
2011-09-29 19:52:13 +00:00
//write the true depth value, if the game uses depth textures pixel shaders will override with the correct values
//if not early z culling will improve speed
VertexShaderGen: Use correct depth output when glClipControl is supported.
2015-05-18 23:18:04 +00:00
if (g_ActiveConfig.backend_info.bSupportsClipControl)
OGL: Depth range inversion.
2015-05-22 20:42:25 +00:00
{
out.Write("o.pos.z = -o.pos.z;\n");
}
Shader generators: Remove any references to D3D9 and cleanup the affected code.
2013-09-22 16:07:21 +00:00
else // OGL
Fixup line endings.
2011-09-29 19:52:13 +00:00
{
Clean up more space/tab mismatches in AudioCommon, Common, and VideoCommon. Not planning to touch Core since it's the most actively changed part of the project.
2013-03-20 01:51:12 +00:00
// this results in a scale from -1..0 to -1..1 after perspective
// divide
OGL: Depth range inversion.
2015-05-22 20:42:25 +00:00
out.Write("o.pos.z = o.pos.z * -2.0 - o.pos.w;\n");
Clean up more space/tab mismatches in AudioCommon, Common, and VideoCommon. Not planning to touch Core since it's the most actively changed part of the project.
2013-03-20 01:51:12 +00:00
// the next steps of the OGL pipeline are:
// (x_c,y_c,z_c,w_c) = o.pos //switch to OGL spec terminology
// clipping to -w_c <= (x_c,y_c,z_c) <= w_c
// (x_d,y_d,z_d) = (x_c,y_c,z_c)/w_c//perspective divide
// z_w = (f-n)/2*z_d + (n+f)/2
// z_w now contains the value to go to the 0..1 depth buffer
//trying to get the correct semantic while not using glDepthRange
//seems to get rather complicated
Fixup line endings.
2011-09-29 19:52:13 +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.
ShaderGen: Fix pixel offset correction We want to move the vertex by 1/12 pixel, but the old code did miss the perspective division. So by multiplying with pos.w, the position is moved correctly after the perspective division.
2015-02-11 19:54:15 +00:00
out.Write("o.pos.xy = o.pos.xy - o.pos.w * " I_PIXELCENTERCORRECTION".xy;\n");
VertexShaderGen: Correct vertex shader output to consider shifted pixel centers. Fixes issue 267.
2014-04-23 21:42:28 +00:00
Fixes spacing for "for", "while", "switch" and "if" Also moved && and || to ends of lines instead of start. Fixed misc vertical alignments and some { needed newlining.
2014-03-10 11:30:55 +00:00
if (api_type == API_OPENGL)
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: Don't read from output variables.
2014-12-22 02:36:39 +00:00
if (g_ActiveConfig.backend_info.bSupportsGeometryShaders)
{
AssignVSOutputMembers(out, "vs", "o");
}
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.
VideoCommon: Don't pass structs between shader stages when geometry shaders are unsupported.
2014-12-17 22:44:05 +00:00
for (unsigned int i = 0; i < xfmem.numTexGen.numTexGens; ++i)
out.Write("uv%d.xyz = o.tex%d;\n", i, i);
out.Write("clipPos = o.clipPos;\n");
if (g_ActiveConfig.bEnablePixelLighting)
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: Don't pass structs between shader stages when geometry shaders are unsupported.
2014-12-17 22:44:05 +00:00
out.Write("Normal = o.Normal;\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
out.Write("WorldPos = o.WorldPos;\n");
}
PixelShaderGen: Don't assign to input variables.
2014-12-25 23:56:12 +00:00
out.Write("colors_0 = o.colors_0;\n");
out.Write("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
}
Merge 'master' into shader-uids-awesome. Conflicts: Source/Core/VideoCommon/Src/LightingShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.cpp Source/Core/VideoCommon/Src/PixelShaderGen.h Source/Core/VideoCommon/Src/PixelShaderManager.cpp Source/Core/VideoCommon/Src/VertexShaderGen.cpp Source/Core/VideoCommon/Src/VertexShaderGen.h Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h
2013-03-26 21:16:29 +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
{
Pass VS_OUTPUT structs between shaders.
2014-10-25 00:05:49 +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
}
Pass VS_OUTPUT structs between shaders.
2014-10-25 00:05:49 +00:00
out.Write("}\n");
Fixup line endings.
2011-09-29 19:52:13 +00:00
ShaderGen: Optimize out most function calls for uid generation.
2013-08-12 11:31:29 +00:00
if (is_writing_shadercode)
{
if (text[sizeof(text) - 1] != 0x7C)
PanicAlert("VertexShader generator - buffer too small, canary has been eaten!");
}
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
}
Fixup line endings.
2011-09-29 19:52:13 +00:00
Moved some of the new shader uid stuff to a common header file.
2012-08-06 21:09:43 +00:00
void GetVertexShaderUid(VertexShaderUid& object, u32 components, API_TYPE api_type)
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: Replace the GenOutput enum by using typeid instead.
2013-03-26 22:21:08 +00:00
GenerateVertexShader<VertexShaderUid>(object, components, api_type);
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
}
Moved some of the new shader uid stuff to a common header file.
2012-08-06 21:09:43 +00:00
void GenerateVertexShaderCode(VertexShaderCode& object, u32 components, API_TYPE api_type)
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: Replace the GenOutput enum by using typeid instead.
2013-03-26 22:21:08 +00:00
GenerateVertexShader<VertexShaderCode>(object, components, api_type);
Fixup line endings.
2011-09-29 19:52:13 +00:00
}