zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-10 23:02:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix issue with shader compilation

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7787 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2019-07-13 01:33:00 +00:00 committed by Christoph Oelckers
parent 616b0c2347
commit 4e04e4a096
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
source/build/src/polymost.cpp
View file

@ -387,7 +387,7 @@ static void calcmat(vec3f_t a0, const vec2f_t *offset, float f, float mat[16], i
mat[14] = (mat[14] + a0.y*mat[2]) + (a0.z*mat[6] + a0.x*mat[10]); mat[14] = (mat[14] + a0.y*mat[2]) + (a0.z*mat[6] + a0.x*mat[10]);
} }
static GLuint polymost2_compileShader(GLenum shaderType, const char* const source, int length) static GLuint polymost2_compileShader(GLenum shaderType, const char* const source, int * pLength = nullptr)
{ {
GLuint shaderID = glCreateShader(shaderType); GLuint shaderID = glCreateShader(shaderType);
if (shaderID == 0) if (shaderID == 0)
@ -398,7 +398,7 @@ static GLuint polymost2_compileShader(GLenum shaderType, const char* const sourc
glShaderSource(shaderID, glShaderSource(shaderID,
1, 1,
&source, &source,
&length); pLength);
glCompileShader(shaderID); glCompileShader(shaderID);
GLint compileStatus; GLint compileStatus;
@ -420,6 +420,11 @@ static GLuint polymost2_compileShader(GLenum shaderType, const char* const sourc
return shaderID; return shaderID;
} }
static GLuint polymost2_compileShader(GLenum shaderType, const char* const source, int length)
{
return polymost2_compileShader(shaderType, source, &length);
}
void polymost_glreset() void polymost_glreset()
{ {
for (bssize_t i=0; i<=MAXPALOOKUPS-1; i++) for (bssize_t i=0; i<=MAXPALOOKUPS-1; i++)
@ -866,8 +871,8 @@ void polymost_glinit()
}\n"; }\n";
polymost2BasicShaderProgramID = glCreateProgram(); polymost2BasicShaderProgramID = glCreateProgram();
GLuint polymost2BasicVertexShaderID = polymost2_compileShader(GL_VERTEX_SHADER, POLYMOST2_BASIC_VERTEX_SHADER_CODE, 0); GLuint polymost2BasicVertexShaderID = polymost2_compileShader(GL_VERTEX_SHADER, POLYMOST2_BASIC_VERTEX_SHADER_CODE);
GLuint polymost2BasicFragmentShaderID = polymost2_compileShader(GL_FRAGMENT_SHADER, POLYMOST2_BASIC_FRAGMENT_SHADER_CODE, 0); GLuint polymost2BasicFragmentShaderID = polymost2_compileShader(GL_FRAGMENT_SHADER, POLYMOST2_BASIC_FRAGMENT_SHADER_CODE);
glBindAttribLocation(polymost2BasicShaderProgramID, 0, "i_vertPos"); glBindAttribLocation(polymost2BasicShaderProgramID, 0, "i_vertPos");
glBindAttribLocation(polymost2BasicShaderProgramID, 1, "i_texCoord"); glBindAttribLocation(polymost2BasicShaderProgramID, 1, "i_texCoord");
glAttachShader(polymost2BasicShaderProgramID, polymost2BasicVertexShaderID); glAttachShader(polymost2BasicShaderProgramID, polymost2BasicVertexShaderID);
@ -890,8 +895,8 @@ void polymost_glinit()
#include "generated/polymost1Frag.glsl.h" #include "generated/polymost1Frag.glsl.h"
polymost1ExtendedShaderProgramID = glCreateProgram(); polymost1ExtendedShaderProgramID = glCreateProgram();
GLuint polymost1BasicVertexShaderID = polymost2_compileShader(GL_VERTEX_SHADER, polymost1Vert, 0); GLuint polymost1BasicVertexShaderID = polymost2_compileShader(GL_VERTEX_SHADER, polymost1Vert);
GLuint polymost1ExtendedFragmentShaderID = polymost2_compileShader(GL_FRAGMENT_SHADER, polymost1Frag, 0); GLuint polymost1ExtendedFragmentShaderID = polymost2_compileShader(GL_FRAGMENT_SHADER, polymost1Frag);
glAttachShader(polymost1ExtendedShaderProgramID, polymost1BasicVertexShaderID); glAttachShader(polymost1ExtendedShaderProgramID, polymost1BasicVertexShaderID);
glAttachShader(polymost1ExtendedShaderProgramID, polymost1ExtendedFragmentShaderID); glAttachShader(polymost1ExtendedShaderProgramID, polymost1ExtendedFragmentShaderID);
glLinkProgram(polymost1ExtendedShaderProgramID); glLinkProgram(polymost1ExtendedShaderProgramID);