Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/src/glsl/ast_to_hir.cpp
	mesalib/src/mesa/SConscript
	mesalib/src/mesa/main/compiler.h
	mesalib/src/mesa/main/enable.c
	mesalib/src/mesa/main/ff_fragment_shader.cpp
	mesalib/src/mesa/main/texcompress_rgtc_tmp.h
	mesalib/src/mesa/main/texobj.c
	mesalib/src/mesa/main/texparam.c
	mesalib/src/mesa/main/uniforms.c
	mesalib/src/mesa/program/ir_to_mesa.cpp
	mesalib/src/mesa/program/prog_print.c
	mesalib/src/mesa/program/prog_statevars.c
	mesalib/src/mesa/program/program.c
	mesalib/src/mesa/program/program_parse.y
	mesalib/src/mesa/program/program_parser.h
	mesalib/src/mesa/program/sampler.cpp
	mesalib/src/mesa/sources.mak
	mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c
	mesalib/src/mesa/state_tracker/st_cb_blit.c
	mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
	mesalib/src/mesa/state_tracker/st_extensions.c
	mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c
	mesalib/src/mesa/state_tracker/st_program.c
	mesalib/src/mesa/state_tracker/st_texture.h
	mesalib/src/mesa/vbo/vbo_exec_array.c
	pixman/pixman/pixman-arm-neon-asm.S
	pixman/pixman/pixman-arm-neon.c

1 files changed, 3 insertions, 3 deletions

diff --git a/mesalib/src/mesa/main/texobj.c b/mesalib/src/mesa/main/texobj.c
index a28c15ba2..72ea03044 100644
--- a/mesalib/src/mesa/main/texobj.c
+++ b/mesalib/src/mesa/main/texobj.c
@@ -842,7 +842,7 @@ _mesa_GenTextures( GLsizei n, GLuint *textures )
       struct gl_texture_object *texObj;

       GLuint name = first + i;

       GLenum target = 0;

-      texObj = (*ctx->Driver.NewTextureObject)( ctx, name, target);

+      texObj = ctx->Driver.NewTextureObject(ctx, name, target);

       if (!texObj) {

          _glthread_UNLOCK_MUTEX(ctx->Shared->Mutex);

          _mesa_error(ctx, GL_OUT_OF_MEMORY, "glGenTextures");

@@ -1066,7 +1066,7 @@ _mesa_BindTexture( GLenum target, GLuint texName )
       }

       else {

          /* if this is a new texture id, allocate a texture object now */

-         newTexObj = (*ctx->Driver.NewTextureObject)(ctx, texName, target);

+         newTexObj = ctx->Driver.NewTextureObject(ctx, texName, target);

          if (!newTexObj) {

             _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindTexture");

             return;

@@ -1108,7 +1108,7 @@ _mesa_BindTexture( GLenum target, GLuint texName )
 

    /* Pass BindTexture call to device driver */

    if (ctx->Driver.BindTexture)

-      (*ctx->Driver.BindTexture)( ctx, target, newTexObj );

+      ctx->Driver.BindTexture(ctx, target, newTexObj);

 }