Skip to content

Commit 83d2afc

Browse files
committed
Fix #775
1 parent d426ea8 commit 83d2afc

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

Plugins/Renderer/gl_common.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,6 @@ class CIndirectDrawAttrib
314314
#define WSURF_STENCIL_NO_GLOW_COLOR_ENABLED 0x200000000ull
315315
#define WSURF_DOUBLE_FACE_ENABLED 0x400000000ull
316316

317-
318317
#define STUDIO_VBO_BASE 0
319318
#define STUDIO_VBO_TBN 1
320319
#define STUDIO_VBO_MAX 2

Plugins/Renderer/gl_wsurf.cpp

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,10 @@ const program_state_mapping_t s_WSurfProgramStateName[] = {
207207
{ WSURF_REVERT_NORMAL_ENABLED ,"WSURF_REVERT_NORMAL_ENABLED"},
208208
{ WSURF_MULTIVIEW_ENABLED ,"WSURF_MULTIVIEW_ENABLED"},
209209
{ WSURF_LINEAR_DEPTH_ENABLED ,"WSURF_LINEAR_DEPTH_ENABLED"},
210+
{ WSURF_GLOW_COLOR_ENABLED ,"WSURF_GLOW_COLOR_ENABLED"},
211+
{ WSURF_STENCIL_NO_GLOW_BLUR_ENABLED ,"WSURF_STENCIL_NO_GLOW_BLUR_ENABLED"},
212+
{ WSURF_STENCIL_NO_GLOW_COLOR_ENABLED ,"WSURF_STENCIL_NO_GLOW_COLOR_ENABLED"},
213+
{ WSURF_DOUBLE_FACE_ENABLED ,"WSURF_DOUBLE_FACE_ENABLED"},
210214
};
211215

212216
void R_SaveWSurfProgramStates(void)
@@ -330,6 +334,18 @@ void R_UseWSurfProgram(program_state_t state, wsurf_program_t* progOutput)
330334
if (state & WSURF_LINEAR_DEPTH_ENABLED)
331335
defs << "#define LINEAR_DEPTH_ENABLED\n";
332336

337+
if (state & WSURF_GLOW_COLOR_ENABLED)
338+
defs << "#define GLOW_COLOR_ENABLED\n";
339+
340+
if (state & WSURF_STENCIL_NO_GLOW_BLUR_ENABLED)
341+
defs << "#define STENCIL_NO_GLOW_BLUR_ENABLED\n";
342+
343+
if (state & WSURF_STENCIL_NO_GLOW_COLOR_ENABLED)
344+
defs << "#define STENCIL_NO_GLOW_COLOR_ENABLED\n";
345+
346+
if (state & WSURF_DOUBLE_FACE_ENABLED)
347+
defs << "#define DOUBLE_FACE_ENABLED\n";
348+
333349
auto def = defs.str();
334350

335351
CCompileShaderArgs args;
@@ -367,7 +383,7 @@ void R_UseWSurfProgram(program_state_t state, wsurf_program_t* progOutput)
367383
}
368384
else
369385
{
370-
g_pMetaHookAPI->SysError("R_UseWSurfProgram: Failed to load program!");
386+
Sys_Error("R_UseWSurfProgram: Failed to load program!");
371387
}
372388
}
373389

0 commit comments

Comments
 (0)