diff options
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/dri/i915/i915_fragprog.c | 10 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_program.c | 9 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_vertprog.c | 7 |
3 files changed, 14 insertions, 12 deletions
diff --git a/src/mesa/drivers/dri/i915/i915_fragprog.c b/src/mesa/drivers/dri/i915/i915_fragprog.c index c5a8ac5532d..fce649d44e3 100644 --- a/src/mesa/drivers/dri/i915/i915_fragprog.c +++ b/src/mesa/drivers/dri/i915/i915_fragprog.c @@ -1144,12 +1144,13 @@ i915BindProgram(struct gl_context * ctx, GLenum target, struct gl_program *prog) } static struct gl_program * -i915NewProgram(struct gl_context * ctx, GLenum target, GLuint id) +i915NewProgram(struct gl_context * ctx, GLenum target, GLuint id, + bool is_arb_asm) { switch (target) { case GL_VERTEX_PROGRAM_ARB: { struct gl_program *prog = rzalloc(NULL, struct gl_program); - return _mesa_init_gl_program(prog, target, id); + return _mesa_init_gl_program(prog, target, id, is_arb_asm); } case GL_FRAGMENT_PROGRAM_ARB:{ @@ -1158,7 +1159,8 @@ i915NewProgram(struct gl_context * ctx, GLenum target, GLuint id) if (prog) { i915_init_program(I915_CONTEXT(ctx), prog); - return _mesa_init_gl_program(&prog->FragProg, target, id); + return _mesa_init_gl_program(&prog->FragProg, target, id, + is_arb_asm); } else return NULL; @@ -1167,7 +1169,7 @@ i915NewProgram(struct gl_context * ctx, GLenum target, GLuint id) default: /* Just fallback: */ - return _mesa_new_program(ctx, target, id); + return _mesa_new_program(ctx, target, id, is_arb_asm); } } diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c index 80a87211020..93b29749b28 100644 --- a/src/mesa/drivers/dri/i965/brw_program.c +++ b/src/mesa/drivers/dri/i965/brw_program.c @@ -136,9 +136,8 @@ get_new_program_id(struct intel_screen *screen) return id; } -static struct gl_program *brwNewProgram( struct gl_context *ctx, - GLenum target, - GLuint id ) +static struct gl_program *brwNewProgram(struct gl_context *ctx, GLenum target, + GLuint id, bool is_arb_asm) { struct brw_context *brw = brw_context(ctx); @@ -152,7 +151,7 @@ static struct gl_program *brwNewProgram( struct gl_context *ctx, if (prog) { prog->id = get_new_program_id(brw->screen); - return _mesa_init_gl_program(&prog->program, target, id); + return _mesa_init_gl_program(&prog->program, target, id, is_arb_asm); } else return NULL; @@ -171,7 +170,7 @@ static struct gl_program *brwNewProgram( struct gl_context *ctx, if (prog) { prog->id = get_new_program_id(brw->screen); - return _mesa_init_gl_program(&prog->program, target, id); + return _mesa_init_gl_program(&prog->program, target, id, is_arb_asm); } else return NULL; diff --git a/src/mesa/drivers/dri/r200/r200_vertprog.c b/src/mesa/drivers/dri/r200/r200_vertprog.c index ded8e2af244..0a3e98428c6 100644 --- a/src/mesa/drivers/dri/r200/r200_vertprog.c +++ b/src/mesa/drivers/dri/r200/r200_vertprog.c @@ -1199,17 +1199,18 @@ r200BindProgram(struct gl_context *ctx, GLenum target, struct gl_program *prog) } static struct gl_program * -r200NewProgram(struct gl_context *ctx, GLenum target, GLuint id) +r200NewProgram(struct gl_context *ctx, GLenum target, GLuint id, + bool is_arb_asm) { switch(target){ case GL_VERTEX_PROGRAM_ARB: { struct r200_vertex_program *vp = rzalloc(NULL, struct r200_vertex_program); - return _mesa_init_gl_program(&vp->mesa_program, target, id); + return _mesa_init_gl_program(&vp->mesa_program, target, id, is_arb_asm); } case GL_FRAGMENT_PROGRAM_ARB: { struct gl_program *prog = rzalloc(NULL, struct gl_program); - return _mesa_init_gl_program(prog, target, id); + return _mesa_init_gl_program(prog, target, id, is_arb_asm); } default: _mesa_problem(ctx, "Bad target in r200NewProgram"); |