From 1cc98f5a48924d750fbef7ea6b05a1ba49c28589 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 5 Nov 2012 07:36:16 +0100 Subject: xserver mesa xkbcomp git update 5 nov 2012 xserver: a194630f7f7b287cb4ea4a459df0745f4c0d4c1a mesa: ccbfe3dde94cd50a4e6468cfeabf95c79c9d8072 xkbcomp: a68c5b7b29eb1433b1be73b50c4248e10eab8e64 --- mesalib/src/mesa/main/dlist.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'mesalib/src/mesa/main/dlist.c') diff --git a/mesalib/src/mesa/main/dlist.c b/mesalib/src/mesa/main/dlist.c index d53879efd..c15043694 100644 --- a/mesalib/src/mesa/main/dlist.c +++ b/mesalib/src/mesa/main/dlist.c @@ -7177,7 +7177,7 @@ save_ProgramParameteri(GLuint program, GLenum pname, GLint value) n[3].i = value; } if (ctx->ExecuteFlag) { - CALL_ProgramParameteriARB(ctx->Exec, (program, pname, value)); + CALL_ProgramParameteri(ctx->Exec, (program, pname, value)); } } @@ -7196,7 +7196,7 @@ save_FramebufferTexture(GLenum target, GLenum attachment, n[4].i = level; } if (ctx->ExecuteFlag) { - CALL_FramebufferTextureARB(ctx->Exec, (target, attachment, texture, level)); + CALL_FramebufferTexture(ctx->Exec, (target, attachment, texture, level)); } } @@ -8509,10 +8509,10 @@ execute_list(struct gl_context *ctx, GLuint list) /* GL_ARB_geometry_shader4 */ case OPCODE_PROGRAM_PARAMETERI: - CALL_ProgramParameteriARB(ctx->Exec, (n[1].ui, n[2].e, n[3].i)); + CALL_ProgramParameteri(ctx->Exec, (n[1].ui, n[2].e, n[3].i)); break; case OPCODE_FRAMEBUFFER_TEXTURE: - CALL_FramebufferTextureARB(ctx->Exec, (n[1].e, n[2].e, + CALL_FramebufferTexture(ctx->Exec, (n[1].e, n[2].e, n[3].ui, n[4].i)); break; case OPCODE_FRAMEBUFFER_TEXTURE_FACE: @@ -10212,8 +10212,8 @@ _mesa_create_save_table(const struct gl_context *ctx) SET_BlendEquationSeparateiARB(table, save_BlendEquationSeparatei); /* GL_ARB_geometry_shader4 */ - SET_ProgramParameteriARB(table, save_ProgramParameteri); - SET_FramebufferTextureARB(table, save_FramebufferTexture); + SET_ProgramParameteri(table, save_ProgramParameteri); + SET_FramebufferTexture(table, save_FramebufferTexture); SET_FramebufferTextureFaceARB(table, save_FramebufferTextureFace); /* GL_NV_conditional_render */ -- cgit v1.2.3