Merge branch 'master' into pipe-video

[mesa.git] / src / mesa / main / context.c

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 41f30cae43cba3782cfb18d0b98193479c7c31d8..9401e3dcc2bb687c4af306d3d52baf45c4ea9197 100644 (file)
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -592,11 +592,7 @@ _mesa_init_constants(struct gl_context *ctx)
 
    /* Shading language version */
    if (ctx->API == API_OPENGL) {
-#if FEATURE_ARB_shading_language_120
       ctx->Const.GLSLVersion = 120;
-#else
-      ctx->Const.GLSLVersion = 110;
-#endif
    }
    else if (ctx->API == API_OPENGLES2) {
       ctx->Const.GLSLVersion = 100;
@@ -949,11 +945,6 @@ _mesa_initialize_context_for_api(struct gl_context *ctx,
 
    switch (ctx->API) {
    case API_OPENGL:
-      /* Neutral tnl module stuff */
-      _mesa_init_exec_vtxfmt( ctx ); 
-      ctx->TnlModule.Current = NULL;
-      ctx->TnlModule.SwapCount = 0;
-
 #if FEATURE_dlist
       ctx->Save = _mesa_create_save_table();
       if (!ctx->Save) {
@@ -1707,10 +1698,10 @@ _mesa_valid_to_render(struct gl_context *ctx, const char *where)
       _mesa_update_state(ctx);
 
    if (ctx->Shader.CurrentProgram) {
-      unsigned i;
+      struct gl_shader_program *const prog = ctx->Shader.CurrentProgram;
 
       /* using shaders */
-      if (!ctx->Shader.CurrentProgram->LinkStatus) {
+      if (!prog->LinkStatus) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "%s(shader not linked)", where);
          return GL_FALSE;
@@ -1718,10 +1709,9 @@ _mesa_valid_to_render(struct gl_context *ctx, const char *where)
 #if 0 /* not normally enabled */
       {
          char errMsg[100];
-         if (!_mesa_validate_shader_program(ctx, ctx->Shader.CurrentProgram,
-                                            errMsg)) {
+         if (!_mesa_validate_shader_program(ctx, prog, errMsg)) {
             _mesa_warning(ctx, "Shader program %u is invalid: %s",
-                          ctx->Shader.CurrentProgram->Name, errMsg);
+                          prog->Name, errMsg);
          }
       }
 #endif
@@ -1730,13 +1720,12 @@ _mesa_valid_to_render(struct gl_context *ctx, const char *where)
        * any stages that are not provided, the corresponding assembly shader
        * target will be validated below.
        */
-      for (i = 0; i < ctx->Shader.CurrentProgram->_NumLinkedShaders; i++) {
-        switch (ctx->Shader.CurrentProgram->_LinkedShaders[i]->Type) {
-        case GL_VERTEX_SHADER: vert_from_glsl_shader = true; break;
-        case GL_GEOMETRY_SHADER_ARB: geom_from_glsl_shader = true; break;
-        case GL_FRAGMENT_SHADER: frag_from_glsl_shader = true; break;
-        }
-      }
+      vert_from_glsl_shader =
+        prog->_LinkedShaders[MESA_SHADER_VERTEX] != NULL;
+      geom_from_glsl_shader =
+        prog->_LinkedShaders[MESA_SHADER_GEOMETRY] != NULL;
+      frag_from_glsl_shader =
+        prog->_LinkedShaders[MESA_SHADER_FRAGMENT] != NULL;
    }
 
 
@@ -1753,6 +1742,7 @@ _mesa_valid_to_render(struct gl_context *ctx, const char *where)
    /* FINISHME: If GL_NV_geometry_program4 is ever supported, the current
     * FINISHME: geometry program should validated here.
     */
+   (void) geom_from_glsl_shader;
 
    if (!frag_from_glsl_shader
        && ctx->FragmentProgram.Enabled && !ctx->FragmentProgram._Enabled) {