forked from pool/doomsday
56 lines
2.0 KiB
Diff
56 lines
2.0 KiB
Diff
From: Jan Engelhardt <ej@inai.de>
|
||
Date: 2026-01-28 11:20:43.161720676 +0100
|
||
|
||
1.
|
||
|
||
When building with -DDENG_OPENGL_API=GLES3,
|
||
GLInfo::NV_texture_barrier does not exist because it is behind
|
||
DENG_OPENGL. Because the call to glTextureBarrierNV() is conditional
|
||
anyway, this suggests that placing the call in a macro block is not
|
||
overly wrong.
|
||
|
||
apps/client/src_render_fx_turbo.cpp: In member function ‘virtual void fx::Ramp::draw()’:
|
||
apps/client/src_render_fx_turbo.cpp:744:21: error: ‘NV_texture_barrier’ is not a member of ‘de::GLInfo’
|
||
744 | GLInfo::NV_texture_barrier()->glTextureBarrierNV();
|
||
|
||
2.
|
||
|
||
DE relies on the GL_BGRA8_EXT definition brought on via Qt5. But if
|
||
Qt5 is not using GLES (but OpenGL 3.3), then building DE with GLES
|
||
runs into a nondefinition error. Include the glext.h header.
|
||
|
||
---
|
||
doomsday/apps/client/src/render/fx/ramp.cpp | 2 ++
|
||
doomsday/sdk/libgui/src/graphics/image.cpp | 1 +
|
||
2 files changed, 3 insertions(+)
|
||
|
||
Index: Doomsday-Engine-2.3.1/doomsday/apps/client/src/render/fx/ramp.cpp
|
||
===================================================================
|
||
--- Doomsday-Engine-2.3.1.orig/doomsday/apps/client/src/render/fx/ramp.cpp
|
||
+++ Doomsday-Engine-2.3.1/doomsday/apps/client/src/render/fx/ramp.cpp
|
||
@@ -91,10 +91,12 @@ void Ramp::draw()
|
||
d->uContrast = de::max(0.1f, vid_contrast);
|
||
d->uBrightness = de::clamp(-0.8f, vid_bright, 0.8f);
|
||
|
||
+#ifdef DENG_OPENGL
|
||
if (GLInfo::extensions().NV_texture_barrier)
|
||
{
|
||
GLInfo::NV_texture_barrier()->glTextureBarrierNV();
|
||
}
|
||
+#endif
|
||
|
||
d->ramp.draw();
|
||
}
|
||
Index: Doomsday-Engine-2.3.1/doomsday/sdk/libgui/src/graphics/image.cpp
|
||
===================================================================
|
||
--- Doomsday-Engine-2.3.1.orig/doomsday/sdk/libgui/src/graphics/image.cpp
|
||
+++ Doomsday-Engine-2.3.1/doomsday/sdk/libgui/src/graphics/image.cpp
|
||
@@ -31,6 +31,7 @@
|
||
#include <QDataStream>
|
||
#include <QPainter>
|
||
#include <QColor>
|
||
+#include <GL/glext.h>
|
||
|
||
namespace de {
|
||
|