Skip to content

Commit

Permalink
GLES: Remove spurious semicolons in shaders.
Browse files Browse the repository at this point in the history
Were causing compile errors on some devices.
  • Loading branch information
unknownbrackets committed Dec 24, 2018
1 parent 01809f8 commit 7ad6270
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion GPU/D3D11/DepalettizeShaderD3D11.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ VS_OUT main(VS_IN input) {
output.Texcoord = input.a_texcoord0;
output.Position = float4(input.a_position, 1.0);
return output;
};
}
)";

static const D3D11_INPUT_ELEMENT_DESC g_DepalVertexElements[] = {
Expand Down
2 changes: 1 addition & 1 deletion GPU/Directx9/DepalettizeShaderDX9.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ VS_OUT main(VS_IN input) {
output.Texcoord = input.a_texcoord0;
output.Position = float4(input.a_position, 1.0);
return output;
};
}
)";

DepalShaderCacheDX9::DepalShaderCacheDX9(Draw::DrawContext *draw) : vertexShader_(nullptr) {
Expand Down
4 changes: 2 additions & 2 deletions GPU/Directx9/FramebufferDX9.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ VS_OUT main( VS_IN In ) {
Out.ProjPos = In.ObjPos;
Out.Uv = In.Uv;
return Out;
};
}
)";

static const char *pscode = R"(
Expand All @@ -72,7 +72,7 @@ struct PS_IN {
float4 main( PS_IN In ) : COLOR {
float4 c = tex2D(s, In.Uv);
return c;
};
}
)";

static const D3DVERTEXELEMENT9 g_FramebufferVertexElements[] = {
Expand Down
4 changes: 2 additions & 2 deletions GPU/GLES/DepalettizeShaderGLES.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ varying vec2 v_texcoord0;
void main() {
v_texcoord0 = a_texcoord0;
gl_Position = a_position;
};
}
)";

static const char *depalVShader300 = R"(
Expand All @@ -48,7 +48,7 @@ out vec2 v_texcoord0;
void main() {
v_texcoord0 = a_texcoord0;
gl_Position = a_position;
};
}
)";

DepalShaderCacheGLES::DepalShaderCacheGLES(Draw::DrawContext *draw) {
Expand Down

0 comments on commit 7ad6270

Please sign in to comment.