st/mesa/r200/i915/i965: eliminate gl_fragment_program

[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 3176dc4ef284582a868fe498a4b6b41a444e704f..08520a394a02f726557ecfd9a3113985d08bf2ff 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_program.c
+++ b/src/mesa/drivers/dri/i965/brw_program.c
@@ -154,7 +154,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.Base, target, id);
+        return _mesa_init_gl_program(&prog->program, target, id);
       }
       else
         return NULL;
@@ -228,8 +228,7 @@ brwProgramStringNotify(struct gl_context *ctx,
 
    switch (target) {
    case GL_FRAGMENT_PROGRAM_ARB: {
-      struct gl_fragment_program *fprog = (struct gl_fragment_program *) prog;
-      struct brw_fragment_program *newFP = brw_fragment_program(fprog);
+      struct brw_fragment_program *newFP = brw_fragment_program(prog);
       const struct brw_fragment_program *curFP =
          brw_fragment_program_const(brw->fragment_program);