Move eye_obj matrices back out of the uniform block

[libs/gl.git] / source / programbuilder.cpp

diff --git a/source/programbuilder.cpp b/source/programbuilder.cpp
index 3fb9094c180975111f4f43bb7a2e0f7beb1eeb9d..832d5898bb33b44efc6c970a79d8250daf86395c 100644 (file)
--- a/source/programbuilder.cpp
+++ b/source/programbuilder.cpp
@@ -134,8 +134,8 @@ const ProgramBuilder::VariableDefinition ProgramBuilder::standard_variables[] =
        { UNIFORM, "environment", "samplerCube", 0, 0 },
        { UNIFORM, "EnvMap::env_eye_matrix", "mat3", 0, 0 },
        { UNIFORM, "Material::reflectivity", "float", 0, 0 },
-       { UNIFORM, "Transform::eye_obj_matrix", "mat4", "gl_ModelViewMatrix", 0 },
-       { UNIFORM, "Transform::eye_obj_normal_matrix", "mat3", "gl_NormalMatrix", 0 },
+       { UNIFORM, "eye_obj_matrix", "mat4", "gl_ModelViewMatrix", 0 },
+       { UNIFORM, "eye_obj_normal_matrix", "mat3", "gl_NormalMatrix", 0 },
        { UNIFORM, "Transform::projection_matrix", "mat4", "gl_ProjectionMatrix", 0 },
        { UNIFORM, "ShadowMap::shd_eye_matrix", "mat4", 0, 0 },
        { UNIFORM, "Lighting::light_sources", "LightSourceParameters[MAX_LIGHTS]", "gl_LightSource[i]", 0 },
@@ -385,6 +385,7 @@ string ProgramBuilder::create_source(const list<ShaderVariable *> &variables, Va
                {
                        if(use_blocks)
                                source += "#version 300 es\n";
+                       source += "precision mediump float;\n";
                }
                else
                {