Merge remote branch 'origin/master' into lp-setup-llvm

[mesa.git] / src / mesa / drivers / dri / i965 / brw_program.c

diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c
index 8bc255a1c077e0cb1fb48573452770b9833f1341..1367d8146968ff0e72a12c055840fd21e9d7011b 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_program.c
+++ b/src/mesa/drivers/dri/i965/brw_program.c
@@ -148,15 +148,9 @@ static GLboolean brwProgramStringNotify( struct gl_context *ctx,
        * using the new FS backend.
        */
       shader_program = _mesa_lookup_shader_program(ctx, prog->Id);
-      if (shader_program) {
-        for (i = 0; i < shader_program->_NumLinkedShaders; i++) {
-           struct brw_shader *shader;
-
-           shader = (struct brw_shader *)shader_program->_LinkedShaders[i];
-           if (shader->base.Type == GL_FRAGMENT_SHADER && shader->ir) {
-              return GL_TRUE;
-           }
-        }
+      if (shader_program
+         && shader_program->_LinkedShaders[MESA_SHADER_FRAGMENT]) {
+        return GL_TRUE;
       }
    }
    else if (target == GL_VERTEX_PROGRAM_ARB) {