libX11 mesa git update 9 Feb 2011

1 files changed, 292 insertions, 292 deletions

diff --git a/mesalib/src/mesa/state_tracker/st_context.c b/mesalib/src/mesa/state_tracker/st_context.c
index 593da8fa6..dccbff3c1 100644
--- a/mesalib/src/mesa/state_tracker/st_context.c
+++ b/mesalib/src/mesa/state_tracker/st_context.c
@@ -1,292 +1,292 @@
-/**************************************************************************

- * 

- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.

- * All Rights Reserved.

- * 

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the

- * "Software"), to deal in the Software without restriction, including

- * without limitation the rights to use, copy, modify, merge, publish,

- * distribute, sub license, and/or sell copies of the Software, and to

- * permit persons to whom the Software is furnished to do so, subject to

- * the following conditions:

- * 

- * The above copyright notice and this permission notice (including the

- * next paragraph) shall be included in all copies or substantial portions

- * of the Software.

- * 

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.

- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR

- * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,

- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE

- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- * 

- **************************************************************************/

-

-#include "main/imports.h"

-#include "main/context.h"

-#include "main/shaderobj.h"

-#include "program/prog_cache.h"

-#include "vbo/vbo.h"

-#include "glapi/glapi.h"

-#include "st_context.h"

-#include "st_debug.h"

-#include "st_cb_accum.h"

-#include "st_cb_bitmap.h"

-#include "st_cb_blit.h"

-#include "st_cb_bufferobjects.h"

-#include "st_cb_clear.h"

-#include "st_cb_condrender.h"

-#include "st_cb_drawpixels.h"

-#include "st_cb_rasterpos.h"

-#include "st_cb_drawtex.h"

-#include "st_cb_eglimage.h"

-#include "st_cb_fbo.h"

-#include "st_cb_feedback.h"

-#include "st_cb_program.h"

-#include "st_cb_queryobj.h"

-#include "st_cb_readpixels.h"

-#include "st_cb_texture.h"

-#include "st_cb_xformfb.h"

-#include "st_cb_flush.h"

-#include "st_cb_strings.h"

-#include "st_cb_viewport.h"

-#include "st_atom.h"

-#include "st_draw.h"

-#include "st_extensions.h"

-#include "st_gen_mipmap.h"

-#include "st_program.h"

-#include "pipe/p_context.h"

-#include "util/u_inlines.h"

-#include "cso_cache/cso_context.h"

-

-

-DEBUG_GET_ONCE_BOOL_OPTION(mesa_mvp_dp4, "MESA_MVP_DP4", FALSE)

-

-

-/**

- * Called via ctx->Driver.UpdateState()

- */

-void st_invalidate_state(struct gl_context * ctx, GLuint new_state)

-{

-   struct st_context *st = st_context(ctx);

-

-   st->dirty.mesa |= new_state;

-   st->dirty.st |= ST_NEW_MESA;

-

-   /* This is the only core Mesa module we depend upon.

-    * No longer use swrast, swsetup, tnl.

-    */

-   _vbo_InvalidateState(ctx, new_state);

-}

-

-

-/**

- * Check for multisample env var override.

- */

-int

-st_get_msaa(void)

-{

-   const char *msaa = _mesa_getenv("__GL_FSAA_MODE");

-   if (msaa)

-      return atoi(msaa);

-   return 0;

-}

-

-

-static struct st_context *

-st_create_context_priv( struct gl_context *ctx, struct pipe_context *pipe )

-{

-   uint i;

-   struct st_context *st = ST_CALLOC_STRUCT( st_context );

-   

-   ctx->st = st;

-

-   st->ctx = ctx;

-   st->pipe = pipe;

-

-   /* XXX: this is one-off, per-screen init: */

-   st_debug_init();

-   

-   /* state tracker needs the VBO module */

-   _vbo_CreateContext(ctx);

-

-   st->dirty.mesa = ~0;

-   st->dirty.st = ~0;

-

-   st->cso_context = cso_create_context(pipe);

-

-   st_init_atoms( st );

-   st_init_bitmap(st);

-   st_init_clear(st);

-   st_init_draw( st );

-   st_init_generate_mipmap(st);

-   st_init_blit(st);

-

-   if(pipe->screen->get_param(pipe->screen, PIPE_CAP_NPOT_TEXTURES))

-      st->internal_target = PIPE_TEXTURE_2D;

-   else

-      st->internal_target = PIPE_TEXTURE_RECT;

-

-   for (i = 0; i < PIPE_MAX_SAMPLERS; i++)

-      st->state.sampler_list[i] = &st->state.samplers[i];

-

-   for (i = 0; i < 3; i++) {

-      memset(&st->velems_util_draw[i], 0, sizeof(struct pipe_vertex_element));

-      st->velems_util_draw[i].src_offset = i * 4 * sizeof(float);

-      st->velems_util_draw[i].instance_divisor = 0;

-      st->velems_util_draw[i].vertex_buffer_index = 0;

-      st->velems_util_draw[i].src_format = PIPE_FORMAT_R32G32B32A32_FLOAT;

-   }

-

-   /* we want all vertex data to be placed in buffer objects */

-   vbo_use_buffer_objects(ctx);

-

-   /* Need these flags:

-    */

-   st->ctx->FragmentProgram._MaintainTexEnvProgram = GL_TRUE;

-

-   st->ctx->VertexProgram._MaintainTnlProgram = GL_TRUE;

-

-   st->pixel_xfer.cache = _mesa_new_program_cache();

-

-   st->force_msaa = st_get_msaa();

-

-   /* GL limits and extensions */

-   st_init_limits(st);

-   st_init_extensions(st);

-

-   return st;

-}

-

-

-struct st_context *st_create_context(gl_api api, struct pipe_context *pipe,

-                                     const struct gl_config *visual,

-                                     struct st_context *share)

-{

-   struct gl_context *ctx;

-   struct gl_context *shareCtx = share ? share->ctx : NULL;

-   struct dd_function_table funcs;

-

-   /* Sanity checks */

-   assert(MESA_SHADER_VERTEX == PIPE_SHADER_VERTEX);

-   assert(MESA_SHADER_FRAGMENT == PIPE_SHADER_FRAGMENT);

-   assert(MESA_SHADER_GEOMETRY == PIPE_SHADER_GEOMETRY);

-

-   memset(&funcs, 0, sizeof(funcs));

-   st_init_driver_functions(&funcs);

-

-   ctx = _mesa_create_context_for_api(api, visual, shareCtx, &funcs, NULL);

-

-   /* XXX: need a capability bit in gallium to query if the pipe

-    * driver prefers DP4 or MUL/MAD for vertex transformation.

-    */

-   if (debug_get_option_mesa_mvp_dp4())

-      _mesa_set_mvp_with_dp4( ctx, GL_TRUE );

-

-   return st_create_context_priv(ctx, pipe);

-}

-

-

-static void st_destroy_context_priv( struct st_context *st )

-{

-   uint i;

-

-   st_destroy_atoms( st );

-   st_destroy_draw( st );

-   st_destroy_generate_mipmap(st);

-   st_destroy_blit(st);

-   st_destroy_clear(st);

-   st_destroy_bitmap(st);

-   st_destroy_drawpix(st);

-   st_destroy_drawtex(st);

-

-   for (i = 0; i < Elements(st->state.sampler_views); i++) {

-      pipe_sampler_view_reference(&st->state.sampler_views[i], NULL);

-   }

-

-   if (st->default_texture) {

-      st->ctx->Driver.DeleteTexture(st->ctx, st->default_texture);

-      st->default_texture = NULL;

-   }

-

-   free( st );

-}

-

- 

-void st_destroy_context( struct st_context *st )

-{

-   struct pipe_context *pipe = st->pipe;

-   struct cso_context *cso = st->cso_context;

-   struct gl_context *ctx = st->ctx;

-   GLuint i;

-

-   /* need to unbind and destroy CSO objects before anything else */

-   cso_release_all(st->cso_context);

-

-   st_reference_fragprog(st, &st->fp, NULL);

-   st_reference_vertprog(st, &st->vp, NULL);

-

-   /* release framebuffer surfaces */

-   for (i = 0; i < PIPE_MAX_COLOR_BUFS; i++) {

-      pipe_surface_reference(&st->state.framebuffer.cbufs[i], NULL);

-   }

-   pipe_surface_reference(&st->state.framebuffer.zsbuf, NULL);

-

-   pipe->set_index_buffer(pipe, NULL);

-

-   for (i = 0; i < PIPE_SHADER_TYPES; i++) {

-      pipe->set_constant_buffer(pipe, i, 0, NULL);

-   }

-

-   _mesa_delete_program_cache(st->ctx, st->pixel_xfer.cache);

-

-   _vbo_DestroyContext(st->ctx);

-

-   st_destroy_program_variants(st);

-

-   _mesa_free_context_data(ctx);

-

-   st_destroy_context_priv(st);

-

-   cso_destroy_context(cso);

-

-   pipe->destroy( pipe );

-

-   free(ctx);

-}

-

-

-void st_init_driver_functions(struct dd_function_table *functions)

-{

-   _mesa_init_shader_object_functions(functions);

-

-   st_init_accum_functions(functions);

-   st_init_blit_functions(functions);

-   st_init_bufferobject_functions(functions);

-   st_init_clear_functions(functions);

-   st_init_bitmap_functions(functions);

-   st_init_drawpixels_functions(functions);

-   st_init_rasterpos_functions(functions);

-

-   st_init_drawtex_functions(functions);

-

-   st_init_eglimage_functions(functions);

-

-   st_init_fbo_functions(functions);

-   st_init_feedback_functions(functions);

-   st_init_program_functions(functions);

-   st_init_query_functions(functions);

-   st_init_cond_render_functions(functions);

-   st_init_readpixels_functions(functions);

-   st_init_texture_functions(functions);

-   st_init_flush_functions(functions);

-   st_init_string_functions(functions);

-   st_init_viewport_functions(functions);

-

-   st_init_xformfb_functions(functions);

-

-   functions->UpdateState = st_invalidate_state;

-}

+/**************************************************************************
+ * 
+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * 
+ **************************************************************************/
+
+#include "main/imports.h"
+#include "main/context.h"
+#include "main/shaderobj.h"
+#include "program/prog_cache.h"
+#include "vbo/vbo.h"
+#include "glapi/glapi.h"
+#include "st_context.h"
+#include "st_debug.h"
+#include "st_cb_accum.h"
+#include "st_cb_bitmap.h"
+#include "st_cb_blit.h"
+#include "st_cb_bufferobjects.h"
+#include "st_cb_clear.h"
+#include "st_cb_condrender.h"
+#include "st_cb_drawpixels.h"
+#include "st_cb_rasterpos.h"
+#include "st_cb_drawtex.h"
+#include "st_cb_eglimage.h"
+#include "st_cb_fbo.h"
+#include "st_cb_feedback.h"
+#include "st_cb_program.h"
+#include "st_cb_queryobj.h"
+#include "st_cb_readpixels.h"
+#include "st_cb_texture.h"
+#include "st_cb_xformfb.h"
+#include "st_cb_flush.h"
+#include "st_cb_strings.h"
+#include "st_cb_viewport.h"
+#include "st_atom.h"
+#include "st_draw.h"
+#include "st_extensions.h"
+#include "st_gen_mipmap.h"
+#include "st_program.h"
+#include "pipe/p_context.h"
+#include "util/u_inlines.h"
+#include "cso_cache/cso_context.h"
+
+
+DEBUG_GET_ONCE_BOOL_OPTION(mesa_mvp_dp4, "MESA_MVP_DP4", FALSE)
+
+
+/**
+ * Called via ctx->Driver.UpdateState()
+ */
+void st_invalidate_state(struct gl_context * ctx, GLuint new_state)
+{
+   struct st_context *st = st_context(ctx);
+
+   st->dirty.mesa |= new_state;
+   st->dirty.st |= ST_NEW_MESA;
+
+   /* This is the only core Mesa module we depend upon.
+    * No longer use swrast, swsetup, tnl.
+    */
+   _vbo_InvalidateState(ctx, new_state);
+}
+
+
+/**
+ * Check for multisample env var override.
+ */
+int
+st_get_msaa(void)
+{
+   const char *msaa = _mesa_getenv("__GL_FSAA_MODE");
+   if (msaa)
+      return atoi(msaa);
+   return 0;
+}
+
+
+static struct st_context *
+st_create_context_priv( struct gl_context *ctx, struct pipe_context *pipe )
+{
+   uint i;
+   struct st_context *st = ST_CALLOC_STRUCT( st_context );
+   
+   ctx->st = st;
+
+   st->ctx = ctx;
+   st->pipe = pipe;
+
+   /* XXX: this is one-off, per-screen init: */
+   st_debug_init();
+   
+   /* state tracker needs the VBO module */
+   _vbo_CreateContext(ctx);
+
+   st->dirty.mesa = ~0;
+   st->dirty.st = ~0;
+
+   st->cso_context = cso_create_context(pipe);
+
+   st_init_atoms( st );
+   st_init_bitmap(st);
+   st_init_clear(st);
+   st_init_draw( st );
+   st_init_generate_mipmap(st);
+   st_init_blit(st);
+
+   if(pipe->screen->get_param(pipe->screen, PIPE_CAP_NPOT_TEXTURES))
+      st->internal_target = PIPE_TEXTURE_2D;
+   else
+      st->internal_target = PIPE_TEXTURE_RECT;
+
+   for (i = 0; i < PIPE_MAX_SAMPLERS; i++)
+      st->state.sampler_list[i] = &st->state.samplers[i];
+
+   for (i = 0; i < 3; i++) {
+      memset(&st->velems_util_draw[i], 0, sizeof(struct pipe_vertex_element));
+      st->velems_util_draw[i].src_offset = i * 4 * sizeof(float);
+      st->velems_util_draw[i].instance_divisor = 0;
+      st->velems_util_draw[i].vertex_buffer_index = 0;
+      st->velems_util_draw[i].src_format = PIPE_FORMAT_R32G32B32A32_FLOAT;
+   }
+
+   /* we want all vertex data to be placed in buffer objects */
+   vbo_use_buffer_objects(ctx);
+
+   /* Need these flags:
+    */
+   st->ctx->FragmentProgram._MaintainTexEnvProgram = GL_TRUE;
+
+   st->ctx->VertexProgram._MaintainTnlProgram = GL_TRUE;
+
+   st->pixel_xfer.cache = _mesa_new_program_cache();
+
+   st->force_msaa = st_get_msaa();
+
+   /* GL limits and extensions */
+   st_init_limits(st);
+   st_init_extensions(st);
+
+   return st;
+}
+
+
+struct st_context *st_create_context(gl_api api, struct pipe_context *pipe,
+                                     const struct gl_config *visual,
+                                     struct st_context *share)
+{
+   struct gl_context *ctx;
+   struct gl_context *shareCtx = share ? share->ctx : NULL;
+   struct dd_function_table funcs;
+
+   /* Sanity checks */
+   assert(MESA_SHADER_VERTEX == PIPE_SHADER_VERTEX);
+   assert(MESA_SHADER_FRAGMENT == PIPE_SHADER_FRAGMENT);
+   assert(MESA_SHADER_GEOMETRY == PIPE_SHADER_GEOMETRY);
+
+   memset(&funcs, 0, sizeof(funcs));
+   st_init_driver_functions(&funcs);
+
+   ctx = _mesa_create_context(api, visual, shareCtx, &funcs, NULL);
+
+   /* XXX: need a capability bit in gallium to query if the pipe
+    * driver prefers DP4 or MUL/MAD for vertex transformation.
+    */
+   if (debug_get_option_mesa_mvp_dp4())
+      _mesa_set_mvp_with_dp4( ctx, GL_TRUE );
+
+   return st_create_context_priv(ctx, pipe);
+}
+
+
+static void st_destroy_context_priv( struct st_context *st )
+{
+   uint i;
+
+   st_destroy_atoms( st );
+   st_destroy_draw( st );
+   st_destroy_generate_mipmap(st);
+   st_destroy_blit(st);
+   st_destroy_clear(st);
+   st_destroy_bitmap(st);
+   st_destroy_drawpix(st);
+   st_destroy_drawtex(st);
+
+   for (i = 0; i < Elements(st->state.sampler_views); i++) {
+      pipe_sampler_view_reference(&st->state.sampler_views[i], NULL);
+   }
+
+   if (st->default_texture) {
+      st->ctx->Driver.DeleteTexture(st->ctx, st->default_texture);
+      st->default_texture = NULL;
+   }
+
+   free( st );
+}
+
+ 
+void st_destroy_context( struct st_context *st )
+{
+   struct pipe_context *pipe = st->pipe;
+   struct cso_context *cso = st->cso_context;
+   struct gl_context *ctx = st->ctx;
+   GLuint i;
+
+   /* need to unbind and destroy CSO objects before anything else */
+   cso_release_all(st->cso_context);
+
+   st_reference_fragprog(st, &st->fp, NULL);
+   st_reference_vertprog(st, &st->vp, NULL);
+
+   /* release framebuffer surfaces */
+   for (i = 0; i < PIPE_MAX_COLOR_BUFS; i++) {
+      pipe_surface_reference(&st->state.framebuffer.cbufs[i], NULL);
+   }
+   pipe_surface_reference(&st->state.framebuffer.zsbuf, NULL);
+
+   pipe->set_index_buffer(pipe, NULL);
+
+   for (i = 0; i < PIPE_SHADER_TYPES; i++) {
+      pipe->set_constant_buffer(pipe, i, 0, NULL);
+   }
+
+   _mesa_delete_program_cache(st->ctx, st->pixel_xfer.cache);
+
+   _vbo_DestroyContext(st->ctx);
+
+   st_destroy_program_variants(st);
+
+   _mesa_free_context_data(ctx);
+
+   st_destroy_context_priv(st);
+
+   cso_destroy_context(cso);
+
+   pipe->destroy( pipe );
+
+   free(ctx);
+}
+
+
+void st_init_driver_functions(struct dd_function_table *functions)
+{
+   _mesa_init_shader_object_functions(functions);
+
+   st_init_accum_functions(functions);
+   st_init_blit_functions(functions);
+   st_init_bufferobject_functions(functions);
+   st_init_clear_functions(functions);
+   st_init_bitmap_functions(functions);
+   st_init_drawpixels_functions(functions);
+   st_init_rasterpos_functions(functions);
+
+   st_init_drawtex_functions(functions);
+
+   st_init_eglimage_functions(functions);
+
+   st_init_fbo_functions(functions);
+   st_init_feedback_functions(functions);
+   st_init_program_functions(functions);
+   st_init_query_functions(functions);
+   st_init_cond_render_functions(functions);
+   st_init_readpixels_functions(functions);
+   st_init_texture_functions(functions);
+   st_init_flush_functions(functions);
+   st_init_string_functions(functions);
+   st_init_viewport_functions(functions);
+
+   st_init_xformfb_functions(functions);
+
+   functions->UpdateState = st_invalidate_state;
+}