zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-13 07:58:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed rendering on macOS

Browse source 
This restores support for OpenGL implementations without persistent mapped buffers, and helps with strict core profile GLSL compilers
This commit is contained in:
alexey.lysiuk 2020-01-26 16:44:08 +02:00 committed by Christoph Oelckers
parent 687573d4c5
commit 2f4078d99e
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/common/rendering/gl/system/gl_buffers.cpp
View file

@ -37,6 +37,7 @@
#include "gl_load.h" #include "gl_load.h"
//#include "glbackend.h" //#include "glbackend.h"
#include "gl_buffers.h" #include "gl_buffers.h"
#include "v_video.h"
namespace OpenGLRenderer namespace OpenGLRenderer
{ {
@ -79,7 +80,7 @@ void GLBuffer::SetData(size_t size, const void *data, bool staticdata)
} }
else else
{ {
mPersistent = /*screen->BuffersArePersistent() &&*/ !staticdata; mPersistent = screen->BuffersArePersistent() && !staticdata;
if (mPersistent) if (mPersistent)
{ {
glBufferStorage(mUseType, size, nullptr, GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT); glBufferStorage(mUseType, size, nullptr, GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT);

4
wadsrc/static/engine/shaders/glsl/glsurface.fp
View file

@ -13,9 +13,9 @@ const float c_paletteOffset = 0.5/256.0;
void main() void main()
{ {
vec4 color = texture2D(s_texture, v_texCoord.xy); vec4 color = texture(s_texture, v_texCoord.xy);
color.r = c_paletteOffset + c_paletteScale*color.r; color.r = c_paletteOffset + c_paletteScale*color.r;
color.rgb = texture2D(s_palette, color.rg).rgb; color.rgb = texture(s_palette, color.rg).rgb;
FragColor = color; FragColor = color;
} }

8
wadsrc/static/engine/shaders/glsl/polymost.fp
View file

@ -163,13 +163,13 @@ void main()
newCoord = vec2(coordX, coordY); newCoord = vec2(coordX, coordY);
// Paletted textures are stored in column major order rather than row major so coordinates need to be swapped here. // Paletted textures are stored in column major order rather than row major so coordinates need to be swapped here.
color = texture2D(s_texture, newCoord); color = texture(s_texture, newCoord);
// This was further down but it really should be done before applying any kind of depth fading, not afterward. // This was further down but it really should be done before applying any kind of depth fading, not afterward.
vec4 detailColor = vec4(1.0); vec4 detailColor = vec4(1.0);
if ((u_flags & RF_DetailMapping) != 0) if ((u_flags & RF_DetailMapping) != 0)
{ {
detailColor = texture2D(s_detail, v_detailCoord.xy); detailColor = texture(s_detail, v_detailCoord.xy);
detailColor = mix(vec4(1.0), 2.0 * detailColor, detailColor.a); detailColor = mix(vec4(1.0), 2.0 * detailColor, detailColor.a);
// Application of this differs based on render mode because for paletted rendering with palettized shade tables it can only be done after processing the shade table. We only have a palette index before. // Application of this differs based on render mode because for paletted rendering with palettized shade tables it can only be done after processing the shade table. We only have a palette index before.
} }
@ -212,7 +212,7 @@ void main()
// The lighting model here does not really allow more than a simple on/off brightmap because anything more complex inteferes with the shade ramp... :( // The lighting model here does not really allow more than a simple on/off brightmap because anything more complex inteferes with the shade ramp... :(
if ((u_flags & RF_Brightmapping) != 0) if ((u_flags & RF_Brightmapping) != 0)
{ {
vec4 brightcolor = texture2D(s_brightmap, v_texCoord.xy); vec4 brightcolor = texture(s_brightmap, v_texCoord.xy);
if (grayscale(brightcolor) > 0.5) if (grayscale(brightcolor) > 0.5)
{ {
shadeIt = false; shadeIt = false;
@ -238,7 +238,7 @@ void main()
if ((u_flags & (RF_ColorOnly|RF_GlowMapping)) == RF_GlowMapping) if ((u_flags & (RF_ColorOnly|RF_GlowMapping)) == RF_GlowMapping)
{ {
vec4 glowColor = texture2D(s_glow, v_texCoord.xy); vec4 glowColor = texture(s_glow, v_texCoord.xy);
color.rgb = mix(color.rgb, glowColor.rgb, glowColor.a); color.rgb = mix(color.rgb, glowColor.rgb, glowColor.a);
} }