lsalzman
/
tesseract
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shader/screen setup fixes

master
Lee Salzman 2013-02-13 17:35:00 +02:00
parent 6f6b7f706c
commit 038df5e79d
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
data/glsl.cfg
View File

@ -41,15 +41,18 @@ gdepthpackfrag = [
gl_FragData[3].rgb = packdepth; gl_FragData[3].rgb = packdepth;
]] ]]
]) ])
gl_FragData[1].a = @(? $arg1 [ghashdepth lineardepth] (? $arg2 $arg2 [0.0])); gl_FragData[1].a = @(if $arg1 [ghashdepth lineardepth] [? $arg2 $arg2 [0.0]]);
] ]
] ]
msaapackfrag = [gdepthpackfrag $msaasamples $arg1] msaapackfrag = [gdepthpackfrag $msaasamples $arg1]
gdepthunpackparams = [ gdepthunpackparams = [
result [ result [
uniform vec3 gdepthscale; #ifndef GDEPTHUNPACKPARAMS
uniform vec3 gdepthunpackparams; #define GDEPTHUNPACKPARAMS
uniform vec3 gdepthscale;
uniform vec3 gdepthunpackparams;
#endif
] ]
] ]

1
src/engine/main.cpp
View File

@ -598,6 +598,7 @@ void setupscreen(int &usedcolorbits)
#endif #endif
SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 0); SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 0);
SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 0); SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 0);
screen = SDL_SetVideoMode(scr_w, scr_h, hasbpp ? colorbits : 0, SDL_OPENGL|flags);
if(!screen) fatal("Unable to create OpenGL screen: %s", SDL_GetError()); if(!screen) fatal("Unable to create OpenGL screen: %s", SDL_GetError());
else else
{ {