1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00

0028734: Visualization, OpenGl_Texture - fix initialization of 1D texture

OpenGl_Texture::Init() - fixed proxy check for 1D textures.
Declarations.glsl - defined occTexture1D/3D aliases similar to occTexture2D.
This commit is contained in:
isk
2016-04-14 12:04:54 +03:00
committed by bugmaster
parent b7c18ef8b0
commit ff6665dc50
3 changed files with 19 additions and 1 deletions

View File

@@ -24,13 +24,17 @@
#define THE_SHADER_IN in
#define THE_SHADER_OUT out
#define THE_OUT out
#define occTexture1D texture
#define occTexture2D texture
#define occTexture3D texture
#else
#define THE_ATTRIBUTE attribute
#define THE_SHADER_IN varying
#define THE_SHADER_OUT varying
#define THE_OUT
#define occTexture1D texture1D
#define occTexture2D texture2D
#define occTexture3D texture3D
#endif
#ifdef GL_ES

View File

@@ -27,13 +27,17 @@ static const char Shaders_Declarations_glsl[] =
" #define THE_SHADER_IN in\n"
" #define THE_SHADER_OUT out\n"
" #define THE_OUT out\n"
" #define occTexture1D texture\n"
" #define occTexture2D texture\n"
" #define occTexture3D texture\n"
"#else\n"
" #define THE_ATTRIBUTE attribute\n"
" #define THE_SHADER_IN varying\n"
" #define THE_SHADER_OUT varying\n"
" #define THE_OUT\n"
" #define occTexture1D texture1D\n"
" #define occTexture2D texture2D\n"
" #define occTexture3D texture3D\n"
"#endif\n"
"\n"
"#ifdef GL_ES\n"