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, 1 insertions, 21 deletions

diff --git a/mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c b/mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c
index 507799cc4..420e6c1b0 100644
--- a/mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c
+++ b/mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c
@@ -84,26 +84,6 @@ make_state_key(struct gl_context *ctx,  struct state_key *key)
 }

 

 

-static struct pipe_resource *

-create_color_map_texture(struct gl_context *ctx)

-{

-   struct st_context *st = st_context(ctx);

-   struct pipe_context *pipe = st->pipe;

-   struct pipe_resource *pt;

-   enum pipe_format format;

-   const uint texSize = 256; /* simple, and usually perfect */

-

-   /* find an RGBA texture format */

-   format = st_choose_format(pipe->screen, GL_RGBA, GL_NONE, GL_NONE,

-                             PIPE_TEXTURE_2D, 0, PIPE_BIND_SAMPLER_VIEW);

-

-   /* create texture for color map/table */

-   pt = st_texture_create(st, PIPE_TEXTURE_2D, format, 0,

-                          texSize, texSize, 1, 1, PIPE_BIND_SAMPLER_VIEW);

-   return pt;

-}

-

-

 /**

  * Update the pixelmap texture with the contents of the R/G/B/A pixel maps.

  */

@@ -219,7 +199,7 @@ get_pixel_transfer_program(struct gl_context *ctx, const struct state_key *key)
 

       /* create the colormap/texture now if not already done */

       if (!st->pixel_xfer.pixelmap_texture) {

-         st->pixel_xfer.pixelmap_texture = create_color_map_texture(ctx);

+         st->pixel_xfer.pixelmap_texture = st_create_color_map_texture(ctx);

          st->pixel_xfer.pixelmap_sampler_view =

             st_create_texture_sampler_view(st->pipe,

                                            st->pixel_xfer.pixelmap_texture);