diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-05-11 01:53:34 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-05-11 01:53:34 +0000 |
| commit | c9875a12fd385d9505eede643d2ed136b8ac58f1 (patch) | |
| tree | e66c2a350abdc655087c550a7fe6c70ce5d6570e /Graphics/GraphicsEngineOpenGL | |
| parent | Added SHADER_SOURCE_LANGUAGE_GLSL_VERBATIM (API Version 240059). (diff) | |
| download | DiligentCore-c9875a12fd385d9505eede643d2ed136b8ac58f1.tar.gz DiligentCore-c9875a12fd385d9505eede643d2ed136b8ac58f1.zip | |
OpenGL backend: added GL_SAMPLER_EXTERNAL_OES as recognizable sampler type
Diffstat (limited to 'Graphics/GraphicsEngineOpenGL')
| -rw-r--r-- | Graphics/GraphicsEngineOpenGL/include/GLStubsAndroid.h | 4 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineOpenGL/include/GLStubsIOS.h | 5 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineOpenGL/src/GLProgramResources.cpp | 2 |
3 files changed, 11 insertions, 0 deletions
diff --git a/Graphics/GraphicsEngineOpenGL/include/GLStubsAndroid.h b/Graphics/GraphicsEngineOpenGL/include/GLStubsAndroid.h index d90ecfd1..ad74a146 100644 --- a/Graphics/GraphicsEngineOpenGL/include/GLStubsAndroid.h +++ b/Graphics/GraphicsEngineOpenGL/include/GLStubsAndroid.h @@ -335,6 +335,10 @@ #define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910D #endif +#ifndef GL_SAMPLER_EXTERNAL_OES + #define GL_SAMPLER_EXTERNAL_OES 0x8D66 +#endif + #ifndef GL_IMAGE_1D #define GL_IMAGE_1D 0x904C diff --git a/Graphics/GraphicsEngineOpenGL/include/GLStubsIOS.h b/Graphics/GraphicsEngineOpenGL/include/GLStubsIOS.h index e9da15aa..bebbc669 100644 --- a/Graphics/GraphicsEngineOpenGL/include/GLStubsIOS.h +++ b/Graphics/GraphicsEngineOpenGL/include/GLStubsIOS.h @@ -136,6 +136,11 @@ # define GL_UNSIGNED_INT_SAMPLER_BUFFER 0x8DD8 #endif +#ifndef GL_SAMPLER_EXTERNAL_OES +# define GL_SAMPLER_EXTERNAL_OES 0x8D66 +#endif + + // Polygon mode #ifndef GL_POINT # define GL_POINT 0x1B00 diff --git a/Graphics/GraphicsEngineOpenGL/src/GLProgramResources.cpp b/Graphics/GraphicsEngineOpenGL/src/GLProgramResources.cpp index 176c1651..83f51383 100644 --- a/Graphics/GraphicsEngineOpenGL/src/GLProgramResources.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/GLProgramResources.cpp @@ -309,6 +309,8 @@ void GLProgramResources::LoadUniforms(SHADER_TYPE Shad case GL_SAMPLER_2D_ARRAY_SHADOW: case GL_SAMPLER_CUBE_SHADOW: + case GL_SAMPLER_EXTERNAL_OES: + case GL_INT_SAMPLER_1D: case GL_INT_SAMPLER_2D: case GL_INT_SAMPLER_3D: |