lucent/cocco-ddraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove unused stuff

Browse source
This commit is contained in:
FunkyFr3sh 2018-05-20 21:59:47 +02:00
parent d43983635c
commit 6d57bbbfcb
2 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
inc/paletteshader.h
View file

@ -18,9 +18,9 @@ const GLchar *PaletteFragShader110Src =
"\n" "\n"
"void main()\n" "void main()\n"
"{\n" "{\n"
" vec4 index = texture2D(SurfaceTex, TexCoord0); \n" " vec4 paletteIndex = texture2D(SurfaceTex, TexCoord0); \n"
" vec4 texel = texture2D(PaletteTex, index.xy); \n" " vec4 outTexel = texture2D(PaletteTex, paletteIndex.xy); \n"
" gl_FragColor = texel;\n" " gl_FragColor = outTexel;\n"
"}\n"; "}\n";
@ -49,17 +49,11 @@ const GLchar *PassthroughVertShaderSrc =
"COMPAT_VARYING vec4 COL0;\n" "COMPAT_VARYING vec4 COL0;\n"
"COMPAT_VARYING vec4 TEX0;\n" "COMPAT_VARYING vec4 TEX0;\n"
"\n" "\n"
"vec4 _oPosition1; \n"
"uniform mat4 MVPMatrix;\n" "uniform mat4 MVPMatrix;\n"
"\n" "\n"
"void main()\n" "void main()\n"
"{\n" "{\n"
" vec4 _oColor;\n" " gl_Position = MVPMatrix * VertexCoord;\n"
" vec2 _otexCoord;\n"
" gl_Position = VertexCoord.x * MVPMatrix[0] + VertexCoord.y * MVPMatrix[1] + VertexCoord.z * MVPMatrix[2] + VertexCoord.w * MVPMatrix[3];\n"
" _oPosition1 = gl_Position;\n"
" _oColor = COLOR;\n"
" _otexCoord = TexCoord.xy;\n"
" COL0 = COLOR;\n" " COL0 = COLOR;\n"
" TEX0.xy = TexCoord.xy;\n" " TEX0.xy = TexCoord.xy;\n"
"}\n"; "}\n";
@ -93,7 +87,7 @@ const GLchar *PaletteFragShaderSrc =
"\n" "\n"
"void main()\n" "void main()\n"
"{\n" "{\n"
" vec4 index = COMPAT_TEXTURE(SurfaceTex, TEX0.xy);\n" " vec4 paletteIndex = COMPAT_TEXTURE(SurfaceTex, TEX0.xy);\n"
" vec4 texel = COMPAT_TEXTURE(PaletteTex, index.xy);\n" " vec4 outTexel = COMPAT_TEXTURE(PaletteTex, paletteIndex.xy);\n"
" FragColor = texel;\n" " FragColor = outTexel;\n"
"}\n"; "}\n";

4
src/render.c
View file

@ -231,8 +231,6 @@ DWORD WINAPI render_main(void)
glBindVertexArray(0); glBindVertexArray(0);
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
glUniform4f(glGetAttribLocation(paletteConvProgram, "Color"), 1, 1, 1, 1);
const float mvpMatrix[16] = { const float mvpMatrix[16] = {
1,0,0,0, 1,0,0,0,
0,1,0,0, 0,1,0,0,
@ -316,8 +314,6 @@ DWORD WINAPI render_main(void)
glUniform2fv(glGetUniformLocation(scaleProgram, "OutputSize"), 1, outputSize); glUniform2fv(glGetUniformLocation(scaleProgram, "OutputSize"), 1, outputSize);
glUniform2fv(glGetUniformLocation(scaleProgram, "TextureSize"), 1, textureSize); glUniform2fv(glGetUniformLocation(scaleProgram, "TextureSize"), 1, textureSize);
glUniform2fv(glGetUniformLocation(scaleProgram, "InputSize"), 1, inputSize); glUniform2fv(glGetUniformLocation(scaleProgram, "InputSize"), 1, inputSize);
glUniform4f(glGetAttribLocation(scaleProgram, "Color"), 1, 1, 1, 1);
glUniform1i(glGetUniformLocation(scaleProgram, "FrameDirection"), 1); glUniform1i(glGetUniformLocation(scaleProgram, "FrameDirection"), 1);
const float mvpMatrix[16] = { const float mvpMatrix[16] = {