diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-11-05 11:00:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-05 11:00:45 -0500 |
| commit | a5bf53ffa4152d1e1e8b65edcd1ba318ec2d2f50 (patch) | |
| tree | 0307d1092b26214198246cabe8310924284ce56f /indra/llrender | |
| parent | 82a924829157f36bf186aadb24689670faf6b47d (diff) | |
| parent | 11cd181d42a510257549e6541c8e381666a5257c (diff) | |
Merge pull request #4934 from RyeMutt/rye/fixlnxbuild
Add GL constants needed for compatibility with physicsextensions_source package
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llgl.cpp | 5 | ||||
| -rw-r--r-- | indra/llrender/llglheaders.h | 20 |
2 files changed, 18 insertions, 7 deletions
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp index c45ad70758..d3720eb85c 100644 --- a/indra/llrender/llgl.cpp +++ b/indra/llrender/llgl.cpp @@ -52,10 +52,7 @@ #include <glm/gtc/matrix_access.hpp> #include "glm/gtc/type_ptr.hpp" -#if LL_MESA_HEADLESS -# include "GL/osmesa.h" -# define LL_GET_PROC_ADDRESS(func) OSMesaGetProcAddress(func) -#elif LL_SDL_WINDOW +#if LL_SDL_WINDOW # include "llwindowsdl.h" # include "SDL3/SDL.h" # define LL_GET_PROC_ADDRESS(func) SDL_GL_GetProcAddress(func) diff --git a/indra/llrender/llglheaders.h b/indra/llrender/llglheaders.h index 9e4d1c5b3a..a3d63810f5 100644 --- a/indra/llrender/llglheaders.h +++ b/indra/llrender/llglheaders.h @@ -72,7 +72,7 @@ #endif // LL_MESA_HEADLESS / LL_SDL_WINDOW // LL_LINUX / LL_WINDOWS / LL_DARWIN -//GL_NVX_gpu_memory_info constants +// GL_NVX_gpu_memory_info constants #ifndef GL_NVX_gpu_memory_info #define GL_NVX_gpu_memory_info #define GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX 0x9047 @@ -82,7 +82,7 @@ #define GL_GPU_MEMORY_INFO_EVICTED_MEMORY_NVX 0x904B #endif -//GL_ATI_meminfo constants +// GL_ATI_meminfo constants #ifndef GL_ATI_meminfo #define GL_ATI_meminfo #define GL_VBO_FREE_MEMORY_ATI 0x87FB @@ -90,7 +90,7 @@ #define GL_RENDERBUFFER_FREE_MEMORY_ATI 0x87FD #endif -//GL_EXT_texture_sRGB constants +// GL_EXT_texture_sRGB constants #ifndef GL_EXT_texture_sRGB #define GL_EXT_texture_sRGB 1 #define GL_SRGB_EXT 0x8C40 @@ -111,6 +111,20 @@ #define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F #endif /* GL_EXT_texture_sRGB */ +// GL_ARB_vertex_buffer_object constants +#ifndef GL_ARB_vertex_buffer_object +#define GL_ARB_vertex_buffer_object 1 +#define GL_STREAM_DRAW_ARB 0x88E0 +#define GL_STREAM_READ_ARB 0x88E1 +#define GL_STREAM_COPY_ARB 0x88E2 +#define GL_STATIC_DRAW_ARB 0x88E4 +#define GL_STATIC_READ_ARB 0x88E5 +#define GL_STATIC_COPY_ARB 0x88E6 +#define GL_DYNAMIC_DRAW_ARB 0x88E8 +#define GL_DYNAMIC_READ_ARB 0x88E9 +#define GL_DYNAMIC_COPY_ARB 0x88EA +#endif + // Deprecated OpenGL defines we still use #define GL_COLOR_INDEX 0x1900 #define GL_ALPHA 0x1906 |