Subversion Repositories eduke32

Compare Revisions

Regard whitespace Rev 8713 → Rev 8712

/source/build/include/polymost.h
69,7 → 69,7
void polymost_activeTexture(GLenum texture);
void polymost_bindTexture(GLenum target, uint32_t textureID);
void polymost_updatePalette(void);
void polymost_useShaderProgram(uint32_t shaderID);
void useShaderProgram(uint32_t shaderID);
 
float* multiplyMatrix4f(float m0[4*4], const float m1[4*4]);
 
/source/build/src/animvpx.cpp
434,7 → 434,7
OSD_Printf("animvpx link log: %s\n", logbuf);
 
/* Finally, use the program. */
polymost_useShaderProgram(PHandle);
useShaderProgram(PHandle);
}
#endif
 
489,7 → 489,7
#ifdef USE_GLEXT
if (glinfo.glsl)
{
polymost_useShaderProgram(0);
useShaderProgram(0);
polymost_resetProgram();
}
#endif
/source/build/src/polymer.cpp
5186,7 → 5186,7
if (!prprograms[programbits].handle)
polymer_compileprogram(programbits);
 
polymost_useShaderProgram(prprograms[programbits].handle);
useShaderProgram(prprograms[programbits].handle);
 
// --------- bit setup
 
5563,7 → 5563,7
glDisableVertexAttribArray(prprograms[programbits].attrib_N);
}
 
polymost_useShaderProgram(0);
useShaderProgram(0);
}
 
static void polymer_compileprogram(int32_t programbits)
/source/build/src/polymost.cpp
613,7 → 613,7
 
polymost_outputGLDebugMessage(3, "polymost_disableProgram()");
 
polymost_useShaderProgram(0);
useShaderProgram(0);
}
 
void polymost_resetProgram()
624,9 → 624,9
polymost_outputGLDebugMessage(3, "polymost_resetProgram()");
 
if (r_enablepolymost2)
polymost_useShaderProgram(polymost2BasicShaderProgramID);
useShaderProgram(polymost2BasicShaderProgramID);
else
polymost_useShaderProgram(polymost1CurrentShaderProgramID);
useShaderProgram(polymost1CurrentShaderProgramID);
 
// ensure that palswapTexture and paletteTexture[curbasepal] is bound
glActiveTexture(GL_TEXTURE1);
641,7 → 641,7
polymost_outputGLDebugMessage(3, "polymost_setCurrentShaderProgram(programID:%u)", programID);
 
polymost1CurrentShaderProgramID = programID;
polymost_useShaderProgram(programID);
useShaderProgram(programID);
 
//update the uniform locations
polymost1TexSamplerLoc = glGetUniformLocation(polymost1CurrentShaderProgramID, "s_texture");
921,7 → 921,7
glBindTexture(GL_TEXTURE_2D, pPth->glpic);
}
 
void polymost_useShaderProgram(uint32_t shaderID)
void useShaderProgram(uint32_t shaderID)
{
if (currentShaderProgramID != shaderID)
glUseProgram(shaderID);
1164,7 → 1164,7
glUniform1i(polymost1TexSamplerLoc, 0);
glUniform1i(polymost1PalSwapSamplerLoc, 1);
glUniform1i(polymost1PaletteSamplerLoc, 2);
polymost_useShaderProgram(0);
useShaderProgram(0);
 
lastbasepal = -1;
for (int basepalnum = 0; basepalnum < MAXBASEPALS; ++basepalnum)
2887,7 → 2887,7
 
handle_blend((dameth & DAMETH_MASKPROPS) > DAMETH_MASK, drawpoly_blend, (dameth & DAMETH_MASKPROPS) == DAMETH_TRANS2);
 
polymost_useShaderProgram(polymost2BasicShaderProgramID);
useShaderProgram(polymost2BasicShaderProgramID);
 
//POGOTODO: batch uniform binding
float tint[4] = {1.0f, 1.0f, 1.0f, 1.0f};