diff options
author | Juan Linietsky <reduzio@gmail.com> | 2016-11-22 20:51:56 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2016-11-22 20:51:56 -0300 |
commit | 9d635f06298f84a59160e8e8cce0187cde6cf74e (patch) | |
tree | 6d3890389f49c3345d0ff6541b406ec968cd2667 /drivers/gles3/shader_gles3.cpp | |
parent | 943d27f46ded993105928c4a46414aa16d84115e (diff) | |
download | redot-engine-9d635f06298f84a59160e8e8cce0187cde6cf74e.tar.gz |
Migrated from GLES to GLAD, fixes many issues.
Diffstat (limited to 'drivers/gles3/shader_gles3.cpp')
-rw-r--r-- | drivers/gles3/shader_gles3.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gles3/shader_gles3.cpp b/drivers/gles3/shader_gles3.cpp index 6f0616035a..0a25f6c3b3 100644 --- a/drivers/gles3/shader_gles3.cpp +++ b/drivers/gles3/shader_gles3.cpp @@ -220,7 +220,7 @@ ShaderGLES3::Version* ShaderGLES3::get_current_version() { /* SETUP CONDITIONALS */ Vector<const char*> strings; -#ifdef GLEW_ENABLED +#ifdef GLES_OVER_GL //strings.push_back("#version 330\n"); strings.push_back("#version 300 es\n"); #else @@ -709,6 +709,8 @@ void ShaderGLES3::setup(const char** p_conditional_defines, int p_conditional_co } } + glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS,&max_image_units); + } void ShaderGLES3::finish() { @@ -804,7 +806,7 @@ ShaderGLES3::ShaderGLES3() { last_custom_code=1; uniforms_dirty = true; base_material_tex_index=0; - glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS,&max_image_units); + } |