zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-12 11:10:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

- make it work again.

Browse source
This commit is contained in:
Christoph Oelckers 2019-10-05 14:17:59 +02:00
parent f99492d6d5
commit 3fb5154dc9
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
source/glbackend/glbackend.cpp
View file

@ -80,6 +80,7 @@ void GLInstance::LoadPolymostShader()
polymostShader = new PolymostShader(); polymostShader = new PolymostShader();
if (!polymostShader->Load("PolymostShader", (const char*)Vert.Data(), (const char*)Frag.Data())) if (!polymostShader->Load("PolymostShader", (const char*)Vert.Data(), (const char*)Frag.Data()))
{ {
wm_msgbox("Fatal Error", "Shader compilation failed");
exit(1); exit(1);
} }
SetPolymostShader(); SetPolymostShader();
@ -97,15 +98,16 @@ void GLInstance::LoadVPXShader()
vpxShader = new FShader(); vpxShader = new FShader();
if (!vpxShader->Load("VPXShader", (const char*)Vert.Data(), (const char*)Frag.Data())) if (!vpxShader->Load("VPXShader", (const char*)Vert.Data(), (const char*)Frag.Data()))
{ {
wm_msgbox("Fatal Error", "Shader compilation failed");
exit(1); exit(1);
} }
} }
void GLInstance::LoadSurfaceShader() void GLInstance::LoadSurfaceShader()
{ {
auto fr1 = GetBaseResource("demolition/shaders/glsl/surface.vp"); auto fr1 = GetBaseResource("demolition/shaders/glsl/glsurface.vp");
TArray<uint8_t> Vert = fr1.Read(); TArray<uint8_t> Vert = fr1.Read();
fr1 = GetBaseResource("demolition/shaders/glsl/surface.fp"); fr1 = GetBaseResource("demolition/shaders/glsl/glsurface.fp");
TArray<uint8_t> Frag = fr1.Read(); TArray<uint8_t> Frag = fr1.Read();
// Zero-terminate both strings. // Zero-terminate both strings.
Vert.Push(0); Vert.Push(0);
@ -113,6 +115,7 @@ void GLInstance::LoadSurfaceShader()
surfaceShader = new SurfaceShader(); surfaceShader = new SurfaceShader();
if (!surfaceShader->Load("SurfaceShader", (const char*)Vert.Data(), (const char*)Frag.Data())) if (!surfaceShader->Load("SurfaceShader", (const char*)Vert.Data(), (const char*)Frag.Data()))
{ {
wm_msgbox("Fatal Error", "Shader compilation failed");
exit(1); exit(1);
} }
} }

14
wadsrc/static/demolition/shaders/glsl/glsurface.vp
View file

@ -1 +1,13 @@
#version 110 attribute vec4 i_vertPos; attribute vec2 i_texCoord; varying vec2 v_texCoord; void main() { gl_Position = i_vertPos; v_texCoord = i_texCoord; } #version 110
attribute vec4 i_vertPos;
attribute vec2 i_texCoord;
varying vec2 v_texCoord;
void main()
{
gl_Position = i_vertPos;
v_texCoord = i_texCoord;
}