OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- use default fragment shader for burn and stencil shader, with the time consuming parts disabled by a #define, to avoid code duplication.

Browse source
This commit is contained in:
Christoph Oelckers 2014-07-10 10:33:07 +02:00
commit a936629cec
4 changed files with 38 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/gl/shaders/gl_shader.cpp
View file

@ -212,6 +212,27 @@ bool FShader::Load(const char * name, const char * vert_prog_lump, const char *
int texture_index = glGetUniformLocation(hShader, "texture2");
if (texture_index > 0) glUniform1i(texture_index, 1);
GLint binaryLength;
void* binary;
FILE* outfile;
GLenum binaryFormat;
//
// Retrieve the binary from the program object
//
glGetProgramiv(hShader, GL_PROGRAM_BINARY_LENGTH, &binaryLength);
binary = (void*)malloc(binaryLength);
glGetProgramBinary(hShader, binaryLength, NULL, &binaryFormat, binary);
//
// Cache the program binary for future runs
//
outfile = fopen(name, "wb");
fwrite(binary, binaryLength, 1, outfile);
fclose(outfile);
free(binary);
glUseProgram(0);
return !!linked;
}
@ -316,8 +337,8 @@ static const FEffectShader effectshaders[]=
{
{ "fogboundary", "shaders/glsl/main.vp", "shaders/glsl/fogboundary.fp", NULL, "" },
{ "spheremap", "shaders/glsl/main.vp", "shaders/glsl/main.fp", "shaders/glsl/func_normal.fp", "#define SPHEREMAP\n" },
{ "burn", "shaders/glsl/burn.vp", "shaders/glsl/burn.fp", NULL, "" },
{ "stencil", "shaders/glsl/stencil.vp", "shaders/glsl/stencil.fp", NULL, "" },
{ "burn", "shaders/glsl/main.vp", "shaders/glsl/burn.fp", NULL, "#define SIMPLE\n" },
{ "stencil", "shaders/glsl/main.vp", "shaders/glsl/stencil.fp", NULL, "#define SIMPLE\n" },
};