diff options
| author | Timothy Arceri <[email protected]> | 2016-11-07 14:47:18 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2016-11-19 15:45:46 +1100 |
| commit | 203c8794a1debc0e45019fe945d1cc55459e6c6f (patch) | |
| tree | 29eafc191c0fb98ebc28673e95d3d1918f883bb0 /src/mesa/main/ff_fragment_shader.cpp | |
| parent | 65cd0a0d7f411eefac81408ebf7b704ccd1c9bf7 (diff) | |
st/mesa/glsl/nir/i965: make use of new gl_shader_program_data in gl_shader_program
Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/mesa/main/ff_fragment_shader.cpp')
| -rw-r--r-- | src/mesa/main/ff_fragment_shader.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/main/ff_fragment_shader.cpp b/src/mesa/main/ff_fragment_shader.cpp index 9aa1dc15cdc..e00eac55beb 100644 --- a/src/mesa/main/ff_fragment_shader.cpp +++ b/src/mesa/main/ff_fragment_shader.cpp @@ -301,7 +301,7 @@ static GLbitfield get_fp_input_mask( struct gl_context *ctx ) /* _NEW_PROGRAM */ const GLboolean vertexShader = (ctx->_Shader->CurrentProgram[MESA_SHADER_VERTEX] && - ctx->_Shader->CurrentProgram[MESA_SHADER_VERTEX]->LinkStatus && + ctx->_Shader->CurrentProgram[MESA_SHADER_VERTEX]->data->LinkStatus && ctx->_Shader->CurrentProgram[MESA_SHADER_VERTEX]->_LinkedShaders[MESA_SHADER_VERTEX]); const GLboolean vertexProgram = ctx->VertexProgram._Enabled; GLbitfield fp_inputs = 0x0; @@ -1266,9 +1266,9 @@ create_new_program(struct gl_context *ctx, struct state_key *key) _mesa_glsl_link_shader(ctx, p.shader_program); - if (!p.shader_program->LinkStatus) + if (!p.shader_program->data->LinkStatus) _mesa_problem(ctx, "Failed to link fixed function fragment shader: %s\n", - p.shader_program->InfoLog); + p.shader_program->data->InfoLog); ralloc_free(p.mem_ctx); return p.shader_program; |