fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 04:48:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965: When using the new FS backend, don't validate the Mesa IR version.

Browse source
This commit is contained in:
Eric Anholt 2010-09-02 09:37:17 -07:00
parent 5c77792859
commit b157113e73
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/mesa/drivers/dri/i965/brw_program.c
View file

@ -132,6 +132,7 @@ static GLboolean brwProgramStringNotify( GLcontext *ctx,
struct brw_fragment_program *newFP = brw_fragment_program(fprog);
const struct brw_fragment_program *curFP =
brw_fragment_program_const(brw->fragment_program);
struct gl_shader_program *shader_program;
if (fprog->FogOption) {
_mesa_append_fog_code(ctx, fprog);
@ -142,6 +143,21 @@ static GLboolean brwProgramStringNotify( GLcontext *ctx,
brw->state.dirty.brw |= BRW_NEW_FRAGMENT_PROGRAM;
newFP->id = brw->program_id++;
newFP->isGLSL = brw_wm_is_glsl(fprog);
/* Don't reject fragment shaders for their Mesa IR state when we're
* 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;
}
}
}
}
else if (target == GL_VERTEX_PROGRAM_ARB) {
struct gl_vertex_program *vprog = (struct gl_vertex_program *) prog;