xserver and mesa git update 28-12-2010

1 files changed, 291 insertions, 291 deletions

diff --git a/mesalib/src/mesa/drivers/dri/common/dri_metaops.c b/mesalib/src/mesa/drivers/dri/common/dri_metaops.c
index a2f404b61..e259f11df 100644
--- a/mesalib/src/mesa/drivers/dri/common/dri_metaops.c
+++ b/mesalib/src/mesa/drivers/dri/common/dri_metaops.c
@@ -1,291 +1,291 @@
-/**************************************************************************
- *
- * Copyright 2006 Tungsten Graphics, Inc., Cedar Park, Texas.
- * Copyright 2009 Intel Corporation.
- * 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/arbprogram.h"
-#include "main/arrayobj.h"
-#include "main/bufferobj.h"
-#include "main/context.h"
-#include "main/enable.h"
-#include "main/matrix.h"
-#include "main/texstate.h"
-#include "main/varray.h"
-#include "main/viewport.h"
-#include "program/program.h"
-#include "dri_metaops.h"
-
-void
-meta_set_passthrough_transform(struct dri_metaops *meta)
-{
-   GLcontext *ctx = meta->ctx;
-
-   meta->saved_vp_x = ctx->Viewport.X;
-   meta->saved_vp_y = ctx->Viewport.Y;
-   meta->saved_vp_width = ctx->Viewport.Width;
-   meta->saved_vp_height = ctx->Viewport.Height;
-   meta->saved_matrix_mode = ctx->Transform.MatrixMode;
-
-   meta->internal_viewport_call = GL_TRUE;
-   _mesa_Viewport(0, 0, ctx->DrawBuffer->Width, ctx->DrawBuffer->Height);
-   meta->internal_viewport_call = GL_FALSE;
-
-   _mesa_MatrixMode(GL_PROJECTION);
-   _mesa_PushMatrix();
-   _mesa_LoadIdentity();
-   _mesa_Ortho(0, ctx->DrawBuffer->Width, 0, ctx->DrawBuffer->Height, 1, -1);
-
-   _mesa_MatrixMode(GL_MODELVIEW);
-   _mesa_PushMatrix();
-   _mesa_LoadIdentity();
-}
-
-void
-meta_restore_transform(struct dri_metaops *meta)
-{
-   _mesa_MatrixMode(GL_PROJECTION);
-   _mesa_PopMatrix();
-   _mesa_MatrixMode(GL_MODELVIEW);
-   _mesa_PopMatrix();
-
-   _mesa_MatrixMode(meta->saved_matrix_mode);
-
-   meta->internal_viewport_call = GL_TRUE;
-   _mesa_Viewport(meta->saved_vp_x, meta->saved_vp_y,
-		  meta->saved_vp_width, meta->saved_vp_height);
-   meta->internal_viewport_call = GL_FALSE;
-}
-
-
-/**
- * Set up a vertex program to pass through the position and first texcoord
- * for pixel path.
- */
-void
-meta_set_passthrough_vertex_program(struct dri_metaops *meta)
-{
-   GLcontext *ctx = meta->ctx;
-   static const char *vp =
-      "!!ARBvp1.0\n"
-      "TEMP vertexClip;\n"
-      "DP4 vertexClip.x, state.matrix.mvp.row[0], vertex.position;\n"
-      "DP4 vertexClip.y, state.matrix.mvp.row[1], vertex.position;\n"
-      "DP4 vertexClip.z, state.matrix.mvp.row[2], vertex.position;\n"
-      "DP4 vertexClip.w, state.matrix.mvp.row[3], vertex.position;\n"
-      "MOV result.position, vertexClip;\n"
-      "MOV result.texcoord[0], vertex.texcoord[0];\n"
-      "MOV result.color, vertex.color;\n"
-      "END\n";
-
-   assert(meta->saved_vp == NULL);
-
-   _mesa_reference_vertprog(ctx, &meta->saved_vp,
-			    ctx->VertexProgram.Current);
-   if (meta->passthrough_vp == NULL) {
-      GLuint prog_name;
-      _mesa_GenPrograms(1, &prog_name);
-      _mesa_BindProgram(GL_VERTEX_PROGRAM_ARB, prog_name);
-      _mesa_ProgramStringARB(GL_VERTEX_PROGRAM_ARB,
-			     GL_PROGRAM_FORMAT_ASCII_ARB,
-			     strlen(vp), (const GLubyte *)vp);
-      _mesa_reference_vertprog(ctx, &meta->passthrough_vp,
-			       ctx->VertexProgram.Current);
-      _mesa_DeletePrograms(1, &prog_name);
-   }
-
-   FLUSH_VERTICES(ctx, _NEW_PROGRAM);
-   _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current,
-			    meta->passthrough_vp);
-   ctx->Driver.BindProgram(ctx, GL_VERTEX_PROGRAM_ARB,
-			   &meta->passthrough_vp->Base);
-
-   meta->saved_vp_enable = ctx->VertexProgram.Enabled;
-   _mesa_Enable(GL_VERTEX_PROGRAM_ARB);
-}
-
-/**
- * Restores the previous vertex program after
- * meta_set_passthrough_vertex_program()
- */
-void
-meta_restore_vertex_program(struct dri_metaops *meta)
-{
-   GLcontext *ctx = meta->ctx;
-
-   FLUSH_VERTICES(ctx, _NEW_PROGRAM);
-   _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current,
-			    meta->saved_vp);
-   _mesa_reference_vertprog(ctx, &meta->saved_vp, NULL);
-   ctx->Driver.BindProgram(ctx, GL_VERTEX_PROGRAM_ARB,
-			   &ctx->VertexProgram.Current->Base);
-
-   if (!meta->saved_vp_enable)
-      _mesa_Disable(GL_VERTEX_PROGRAM_ARB);
-}
-
-/**
- * Binds the given program string to GL_FRAGMENT_PROGRAM_ARB, caching the
- * program object.
- */
-void
-meta_set_fragment_program(struct dri_metaops *meta,
-			  struct gl_fragment_program **prog,
-			  const char *prog_string)
-{
-   GLcontext *ctx = meta->ctx;
-   assert(meta->saved_fp == NULL);
-
-   _mesa_reference_fragprog(ctx, &meta->saved_fp,
-			    ctx->FragmentProgram.Current);
-   if (*prog == NULL) {
-      GLuint prog_name;
-      _mesa_GenPrograms(1, &prog_name);
-      _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, prog_name);
-      _mesa_ProgramStringARB(GL_FRAGMENT_PROGRAM_ARB,
-			     GL_PROGRAM_FORMAT_ASCII_ARB,
-			     strlen(prog_string), (const GLubyte *)prog_string);
-      _mesa_reference_fragprog(ctx, prog, ctx->FragmentProgram.Current);
-      /* Note that DeletePrograms unbinds the program on us */
-      _mesa_DeletePrograms(1, &prog_name);
-   }
-
-   FLUSH_VERTICES(ctx, _NEW_PROGRAM);
-   _mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current, *prog);
-   ctx->Driver.BindProgram(ctx, GL_FRAGMENT_PROGRAM_ARB, &((*prog)->Base));
-
-   meta->saved_fp_enable = ctx->FragmentProgram.Enabled;
-   _mesa_Enable(GL_FRAGMENT_PROGRAM_ARB);
-}
-
-/**
- * Restores the previous fragment program after
- * meta_set_fragment_program()
- */
-void
-meta_restore_fragment_program(struct dri_metaops *meta)
-{
-   GLcontext *ctx = meta->ctx;
-
-   FLUSH_VERTICES(ctx, _NEW_PROGRAM);
-   _mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current,
-			    meta->saved_fp);
-   _mesa_reference_fragprog(ctx, &meta->saved_fp, NULL);
-   ctx->Driver.BindProgram(ctx, GL_FRAGMENT_PROGRAM_ARB,
-			   &ctx->FragmentProgram.Current->Base);
-
-   if (!meta->saved_fp_enable)
-      _mesa_Disable(GL_FRAGMENT_PROGRAM_ARB);
-}
-
-static const float default_texcoords[4][2] = { { 0.0, 0.0 },
-					       { 1.0, 0.0 },
-					       { 1.0, 1.0 },
-					       { 0.0, 1.0 } };
-
-void
-meta_set_default_texrect(struct dri_metaops *meta)
-{
-   GLcontext *ctx = meta->ctx;
-   struct gl_client_array *old_texcoord_array;
-
-   meta->saved_active_texture = ctx->Texture.CurrentUnit;
-   if (meta->saved_array_vbo == NULL) {
-      _mesa_reference_buffer_object(ctx, &meta->saved_array_vbo,
-				    ctx->Array.ArrayBufferObj);
-   }
-
-   old_texcoord_array = &ctx->Array.ArrayObj->TexCoord[0];
-   meta->saved_texcoord_type = old_texcoord_array->Type;
-   meta->saved_texcoord_size = old_texcoord_array->Size;
-   meta->saved_texcoord_stride = old_texcoord_array->Stride;
-   meta->saved_texcoord_enable = old_texcoord_array->Enabled;
-   meta->saved_texcoord_ptr = old_texcoord_array->Ptr;
-   _mesa_reference_buffer_object(ctx, &meta->saved_texcoord_vbo,
-				 old_texcoord_array->BufferObj);
-
-   _mesa_ClientActiveTextureARB(GL_TEXTURE0);
-
-   if (meta->texcoord_vbo == NULL) {
-      GLuint vbo_name;
-
-      _mesa_GenBuffersARB(1, &vbo_name);
-      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, vbo_name);
-      _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(default_texcoords),
-			  default_texcoords, GL_STATIC_DRAW_ARB);
-      _mesa_reference_buffer_object(ctx, &meta->texcoord_vbo,
-				    ctx->Array.ArrayBufferObj);
-   } else {
-      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB,
-			  meta->texcoord_vbo->Name);
-   }
-   _mesa_TexCoordPointer(2, GL_FLOAT, 2 * sizeof(GLfloat), NULL);
-
-   _mesa_Enable(GL_TEXTURE_COORD_ARRAY);
-}
-
-void
-meta_restore_texcoords(struct dri_metaops *meta)
-{
-   GLcontext *ctx = meta->ctx;
-
-   /* Restore the old TexCoordPointer */
-   if (meta->saved_texcoord_vbo) {
-      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB,
-			  meta->saved_texcoord_vbo->Name);
-      _mesa_reference_buffer_object(ctx, &meta->saved_texcoord_vbo, NULL);
-   } else {
-      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
-   }
-
-   _mesa_TexCoordPointer(meta->saved_texcoord_size,
-			 meta->saved_texcoord_type,
-			 meta->saved_texcoord_stride,
-			 meta->saved_texcoord_ptr);
-   if (!meta->saved_texcoord_enable)
-      _mesa_Disable(GL_TEXTURE_COORD_ARRAY);
-
-   _mesa_ClientActiveTextureARB(GL_TEXTURE0 +
-				meta->saved_active_texture);
-
-   if (meta->saved_array_vbo) {
-      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB,
-			  meta->saved_array_vbo->Name);
-      _mesa_reference_buffer_object(ctx, &meta->saved_array_vbo, NULL);
-   } else {
-      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
-   }
-}
-
-
-void meta_init_metaops(GLcontext *ctx, struct dri_metaops *meta)
-{
-   meta->ctx = ctx;
-}
-
-void meta_destroy_metaops(struct dri_metaops *meta)
-{
-
-}
+/**************************************************************************

+ *

+ * Copyright 2006 Tungsten Graphics, Inc., Cedar Park, Texas.

+ * Copyright 2009 Intel Corporation.

+ * 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/arbprogram.h"

+#include "main/arrayobj.h"

+#include "main/bufferobj.h"

+#include "main/context.h"

+#include "main/enable.h"

+#include "main/matrix.h"

+#include "main/texstate.h"

+#include "main/varray.h"

+#include "main/viewport.h"

+#include "program/program.h"

+#include "dri_metaops.h"

+

+void

+meta_set_passthrough_transform(struct dri_metaops *meta)

+{

+   struct gl_context *ctx = meta->ctx;

+

+   meta->saved_vp_x = ctx->Viewport.X;

+   meta->saved_vp_y = ctx->Viewport.Y;

+   meta->saved_vp_width = ctx->Viewport.Width;

+   meta->saved_vp_height = ctx->Viewport.Height;

+   meta->saved_matrix_mode = ctx->Transform.MatrixMode;

+

+   meta->internal_viewport_call = GL_TRUE;

+   _mesa_Viewport(0, 0, ctx->DrawBuffer->Width, ctx->DrawBuffer->Height);

+   meta->internal_viewport_call = GL_FALSE;

+

+   _mesa_MatrixMode(GL_PROJECTION);

+   _mesa_PushMatrix();

+   _mesa_LoadIdentity();

+   _mesa_Ortho(0, ctx->DrawBuffer->Width, 0, ctx->DrawBuffer->Height, 1, -1);

+

+   _mesa_MatrixMode(GL_MODELVIEW);

+   _mesa_PushMatrix();

+   _mesa_LoadIdentity();

+}

+

+void

+meta_restore_transform(struct dri_metaops *meta)

+{

+   _mesa_MatrixMode(GL_PROJECTION);

+   _mesa_PopMatrix();

+   _mesa_MatrixMode(GL_MODELVIEW);

+   _mesa_PopMatrix();

+

+   _mesa_MatrixMode(meta->saved_matrix_mode);

+

+   meta->internal_viewport_call = GL_TRUE;

+   _mesa_Viewport(meta->saved_vp_x, meta->saved_vp_y,

+		  meta->saved_vp_width, meta->saved_vp_height);

+   meta->internal_viewport_call = GL_FALSE;

+}

+

+

+/**

+ * Set up a vertex program to pass through the position and first texcoord

+ * for pixel path.

+ */

+void

+meta_set_passthrough_vertex_program(struct dri_metaops *meta)

+{

+   struct gl_context *ctx = meta->ctx;

+   static const char *vp =

+      "!!ARBvp1.0\n"

+      "TEMP vertexClip;\n"

+      "DP4 vertexClip.x, state.matrix.mvp.row[0], vertex.position;\n"

+      "DP4 vertexClip.y, state.matrix.mvp.row[1], vertex.position;\n"

+      "DP4 vertexClip.z, state.matrix.mvp.row[2], vertex.position;\n"

+      "DP4 vertexClip.w, state.matrix.mvp.row[3], vertex.position;\n"

+      "MOV result.position, vertexClip;\n"

+      "MOV result.texcoord[0], vertex.texcoord[0];\n"

+      "MOV result.color, vertex.color;\n"

+      "END\n";

+

+   assert(meta->saved_vp == NULL);

+

+   _mesa_reference_vertprog(ctx, &meta->saved_vp,

+			    ctx->VertexProgram.Current);

+   if (meta->passthrough_vp == NULL) {

+      GLuint prog_name;

+      _mesa_GenPrograms(1, &prog_name);

+      _mesa_BindProgram(GL_VERTEX_PROGRAM_ARB, prog_name);

+      _mesa_ProgramStringARB(GL_VERTEX_PROGRAM_ARB,

+			     GL_PROGRAM_FORMAT_ASCII_ARB,

+			     strlen(vp), (const GLubyte *)vp);

+      _mesa_reference_vertprog(ctx, &meta->passthrough_vp,

+			       ctx->VertexProgram.Current);

+      _mesa_DeletePrograms(1, &prog_name);

+   }

+

+   FLUSH_VERTICES(ctx, _NEW_PROGRAM);

+   _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current,

+			    meta->passthrough_vp);

+   ctx->Driver.BindProgram(ctx, GL_VERTEX_PROGRAM_ARB,

+			   &meta->passthrough_vp->Base);

+

+   meta->saved_vp_enable = ctx->VertexProgram.Enabled;

+   _mesa_Enable(GL_VERTEX_PROGRAM_ARB);

+}

+

+/**

+ * Restores the previous vertex program after

+ * meta_set_passthrough_vertex_program()

+ */

+void

+meta_restore_vertex_program(struct dri_metaops *meta)

+{

+   struct gl_context *ctx = meta->ctx;

+

+   FLUSH_VERTICES(ctx, _NEW_PROGRAM);

+   _mesa_reference_vertprog(ctx, &ctx->VertexProgram.Current,

+			    meta->saved_vp);

+   _mesa_reference_vertprog(ctx, &meta->saved_vp, NULL);

+   ctx->Driver.BindProgram(ctx, GL_VERTEX_PROGRAM_ARB,

+			   &ctx->VertexProgram.Current->Base);

+

+   if (!meta->saved_vp_enable)

+      _mesa_Disable(GL_VERTEX_PROGRAM_ARB);

+}

+

+/**

+ * Binds the given program string to GL_FRAGMENT_PROGRAM_ARB, caching the

+ * program object.

+ */

+void

+meta_set_fragment_program(struct dri_metaops *meta,

+			  struct gl_fragment_program **prog,

+			  const char *prog_string)

+{

+   struct gl_context *ctx = meta->ctx;

+   assert(meta->saved_fp == NULL);

+

+   _mesa_reference_fragprog(ctx, &meta->saved_fp,

+			    ctx->FragmentProgram.Current);

+   if (*prog == NULL) {

+      GLuint prog_name;

+      _mesa_GenPrograms(1, &prog_name);

+      _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, prog_name);

+      _mesa_ProgramStringARB(GL_FRAGMENT_PROGRAM_ARB,

+			     GL_PROGRAM_FORMAT_ASCII_ARB,

+			     strlen(prog_string), (const GLubyte *)prog_string);

+      _mesa_reference_fragprog(ctx, prog, ctx->FragmentProgram.Current);

+      /* Note that DeletePrograms unbinds the program on us */

+      _mesa_DeletePrograms(1, &prog_name);

+   }

+

+   FLUSH_VERTICES(ctx, _NEW_PROGRAM);

+   _mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current, *prog);

+   ctx->Driver.BindProgram(ctx, GL_FRAGMENT_PROGRAM_ARB, &((*prog)->Base));

+

+   meta->saved_fp_enable = ctx->FragmentProgram.Enabled;

+   _mesa_Enable(GL_FRAGMENT_PROGRAM_ARB);

+}

+

+/**

+ * Restores the previous fragment program after

+ * meta_set_fragment_program()

+ */

+void

+meta_restore_fragment_program(struct dri_metaops *meta)

+{

+   struct gl_context *ctx = meta->ctx;

+

+   FLUSH_VERTICES(ctx, _NEW_PROGRAM);

+   _mesa_reference_fragprog(ctx, &ctx->FragmentProgram.Current,

+			    meta->saved_fp);

+   _mesa_reference_fragprog(ctx, &meta->saved_fp, NULL);

+   ctx->Driver.BindProgram(ctx, GL_FRAGMENT_PROGRAM_ARB,

+			   &ctx->FragmentProgram.Current->Base);

+

+   if (!meta->saved_fp_enable)

+      _mesa_Disable(GL_FRAGMENT_PROGRAM_ARB);

+}

+

+static const float default_texcoords[4][2] = { { 0.0, 0.0 },

+					       { 1.0, 0.0 },

+					       { 1.0, 1.0 },

+					       { 0.0, 1.0 } };

+

+void

+meta_set_default_texrect(struct dri_metaops *meta)

+{

+   struct gl_context *ctx = meta->ctx;

+   struct gl_client_array *old_texcoord_array;

+

+   meta->saved_active_texture = ctx->Texture.CurrentUnit;

+   if (meta->saved_array_vbo == NULL) {

+      _mesa_reference_buffer_object(ctx, &meta->saved_array_vbo,

+				    ctx->Array.ArrayBufferObj);

+   }

+

+   old_texcoord_array = &ctx->Array.ArrayObj->TexCoord[0];

+   meta->saved_texcoord_type = old_texcoord_array->Type;

+   meta->saved_texcoord_size = old_texcoord_array->Size;

+   meta->saved_texcoord_stride = old_texcoord_array->Stride;

+   meta->saved_texcoord_enable = old_texcoord_array->Enabled;

+   meta->saved_texcoord_ptr = old_texcoord_array->Ptr;

+   _mesa_reference_buffer_object(ctx, &meta->saved_texcoord_vbo,

+				 old_texcoord_array->BufferObj);

+

+   _mesa_ClientActiveTextureARB(GL_TEXTURE0);

+

+   if (meta->texcoord_vbo == NULL) {

+      GLuint vbo_name;

+

+      _mesa_GenBuffersARB(1, &vbo_name);

+      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, vbo_name);

+      _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(default_texcoords),

+			  default_texcoords, GL_STATIC_DRAW_ARB);

+      _mesa_reference_buffer_object(ctx, &meta->texcoord_vbo,

+				    ctx->Array.ArrayBufferObj);

+   } else {

+      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB,

+			  meta->texcoord_vbo->Name);

+   }

+   _mesa_TexCoordPointer(2, GL_FLOAT, 2 * sizeof(GLfloat), NULL);

+

+   _mesa_Enable(GL_TEXTURE_COORD_ARRAY);

+}

+

+void

+meta_restore_texcoords(struct dri_metaops *meta)

+{

+   struct gl_context *ctx = meta->ctx;

+

+   /* Restore the old TexCoordPointer */

+   if (meta->saved_texcoord_vbo) {

+      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB,

+			  meta->saved_texcoord_vbo->Name);

+      _mesa_reference_buffer_object(ctx, &meta->saved_texcoord_vbo, NULL);

+   } else {

+      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, 0);

+   }

+

+   _mesa_TexCoordPointer(meta->saved_texcoord_size,

+			 meta->saved_texcoord_type,

+			 meta->saved_texcoord_stride,

+			 meta->saved_texcoord_ptr);

+   if (!meta->saved_texcoord_enable)

+      _mesa_Disable(GL_TEXTURE_COORD_ARRAY);

+

+   _mesa_ClientActiveTextureARB(GL_TEXTURE0 +

+				meta->saved_active_texture);

+

+   if (meta->saved_array_vbo) {

+      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB,

+			  meta->saved_array_vbo->Name);

+      _mesa_reference_buffer_object(ctx, &meta->saved_array_vbo, NULL);

+   } else {

+      _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, 0);

+   }

+}

+

+

+void meta_init_metaops(struct gl_context *ctx, struct dri_metaops *meta)

+{

+   meta->ctx = ctx;

+}

+

+void meta_destroy_metaops(struct dri_metaops *meta)

+{

+

+}