mesa xkbcomp git update 7 Juli 2011

3 files changed, 650 insertions, 684 deletions

diff --git a/mesalib/src/mesa/main/arbprogram.c b/mesalib/src/mesa/main/arbprogram.c
index 26d781954..b83369d9e 100644
--- a/mesalib/src/mesa/main/arbprogram.c
+++ b/mesalib/src/mesa/main/arbprogram.c
@@ -269,6 +269,71 @@ _mesa_IsProgramARB(GLuint id)
       return GL_FALSE;
 }
 
+static GLboolean
+get_local_param_pointer(struct gl_context *ctx, const char *func,
+			GLenum target, GLuint index, GLfloat **param)
+{
+   struct gl_program *prog;
+   GLuint maxParams;
+
+   if (target == GL_VERTEX_PROGRAM_ARB
+       && ctx->Extensions.ARB_vertex_program) {
+      prog = &(ctx->VertexProgram.Current->Base);
+      maxParams = ctx->Const.VertexProgram.MaxLocalParams;
+   }
+   else if (target == GL_FRAGMENT_PROGRAM_ARB
+            && ctx->Extensions.ARB_fragment_program) {
+      prog = &(ctx->FragmentProgram.Current->Base);
+      maxParams = ctx->Const.FragmentProgram.MaxLocalParams;
+   }
+   else if (target == GL_FRAGMENT_PROGRAM_NV
+            && ctx->Extensions.NV_fragment_program) {
+      prog = &(ctx->FragmentProgram.Current->Base);
+      maxParams = MAX_NV_FRAGMENT_PROGRAM_PARAMS;
+   }
+   else {
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "%s(target)", func);
+      return GL_FALSE;
+   }
+
+   if (index >= maxParams) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "%s(index)", func);
+      return GL_FALSE;
+   }
+
+   *param = prog->LocalParams[index];
+   return GL_TRUE;
+}
+
+
+static GLboolean
+get_env_param_pointer(struct gl_context *ctx, const char *func,
+		      GLenum target, GLuint index, GLfloat **param)
+{
+   if (target == GL_FRAGMENT_PROGRAM_ARB
+       && ctx->Extensions.ARB_fragment_program) {
+      if (index >= ctx->Const.FragmentProgram.MaxEnvParams) {
+         _mesa_error(ctx, GL_INVALID_VALUE, "%s(index)", func);
+         return GL_FALSE;
+      }
+      *param = ctx->FragmentProgram.Parameters[index];
+      return GL_TRUE;
+   }
+   else if (target == GL_VERTEX_PROGRAM_ARB &&
+	    (ctx->Extensions.ARB_vertex_program ||
+	     ctx->Extensions.NV_vertex_program)) {
+      if (index >= ctx->Const.VertexProgram.MaxEnvParams) {
+         _mesa_error(ctx, GL_INVALID_VALUE, "%s(index)", func);
+         return GL_FALSE;
+      }
+      *param = ctx->VertexProgram.Parameters[index];
+      return GL_TRUE;
+   } else {
+      _mesa_error(ctx, GL_INVALID_ENUM, "%s(target)", func);
+      return GL_FALSE;
+   }
+}
 
 void GLAPIENTRY
 _mesa_ProgramStringARB(GLenum target, GLenum format, GLsizei len,
@@ -383,30 +448,16 @@ void GLAPIENTRY
 _mesa_ProgramEnvParameter4fARB(GLenum target, GLuint index,
                                GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
+   GLfloat *param;
+
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
    FLUSH_VERTICES(ctx, _NEW_PROGRAM_CONSTANTS);
 
-   if (target == GL_FRAGMENT_PROGRAM_ARB
-       && ctx->Extensions.ARB_fragment_program) {
-      if (index >= ctx->Const.FragmentProgram.MaxEnvParams) {
-         _mesa_error(ctx, GL_INVALID_VALUE, "glProgramEnvParameter(index)");
-         return;
-      }
-      ASSIGN_4V(ctx->FragmentProgram.Parameters[index], x, y, z, w);
-   }
-   else if (target == GL_VERTEX_PROGRAM_ARB /* == GL_VERTEX_PROGRAM_NV */
-       && (ctx->Extensions.ARB_vertex_program || ctx->Extensions.NV_vertex_program)) {
-      if (index >= ctx->Const.VertexProgram.MaxEnvParams) {
-         _mesa_error(ctx, GL_INVALID_VALUE, "glProgramEnvParameter(index)");
-         return;
-      }
-      ASSIGN_4V(ctx->VertexProgram.Parameters[index], x, y, z, w);
-   }
-   else {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glProgramEnvParameter(target)");
-      return;
+   if (get_env_param_pointer(ctx, "glProgramEnvParameter",
+			     target, index, &param)) {
+      ASSIGN_4V(param, x, y, z, w);
    }
 }
 
@@ -422,32 +473,16 @@ void GLAPIENTRY
 _mesa_ProgramEnvParameter4fvARB(GLenum target, GLuint index,
                                 const GLfloat *params)
 {
+   GLfloat *param;
+
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
    FLUSH_VERTICES(ctx, _NEW_PROGRAM_CONSTANTS);
 
-   if (target == GL_FRAGMENT_PROGRAM_ARB
-       && ctx->Extensions.ARB_fragment_program) {
-      if (index >= ctx->Const.FragmentProgram.MaxEnvParams) {
-         _mesa_error(ctx, GL_INVALID_VALUE, "glProgramEnvParameter4fv(index)");
-         return;
-      }
-      memcpy(ctx->FragmentProgram.Parameters[index], params,
-             4 * sizeof(GLfloat));
-   }
-   else if (target == GL_VERTEX_PROGRAM_ARB /* == GL_VERTEX_PROGRAM_NV */
-       && (ctx->Extensions.ARB_vertex_program || ctx->Extensions.NV_vertex_program)) {
-      if (index >= ctx->Const.VertexProgram.MaxEnvParams) {
-         _mesa_error(ctx, GL_INVALID_VALUE, "glProgramEnvParameter4fv(index)");
-         return;
-      }
-      memcpy(ctx->VertexProgram.Parameters[index], params,
-             4 * sizeof(GLfloat));
-   }
-   else {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glProgramEnvParameter4fv(target)");
-      return;
+   if (get_env_param_pointer(ctx, "glProgramEnvParameter4fv",
+			      target, index, &param)) {
+      memcpy(param, params, 4 * sizeof(GLfloat));
    }
 }
 
@@ -496,14 +531,11 @@ _mesa_GetProgramEnvParameterdvARB(GLenum target, GLuint index,
                                   GLdouble *params)
 {
    GET_CURRENT_CONTEXT(ctx);
-   GLfloat fparams[4];
+   GLfloat *fparam;
 
-   _mesa_GetProgramEnvParameterfvARB(target, index, fparams);
-   if (ctx->ErrorValue == GL_NO_ERROR) {
-      params[0] = fparams[0];
-      params[1] = fparams[1];
-      params[2] = fparams[2];
-      params[3] = fparams[3];
+   if (get_env_param_pointer(ctx, "glGetProgramEnvParameterdv",
+			     target, index, &fparam)) {
+      COPY_4V(params, fparam);
    }
 }
 
@@ -512,29 +544,15 @@ void GLAPIENTRY
 _mesa_GetProgramEnvParameterfvARB(GLenum target, GLuint index, 
                                   GLfloat *params)
 {
+   GLfloat *param;
+
    GET_CURRENT_CONTEXT(ctx);
 
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-   if (target == GL_FRAGMENT_PROGRAM_ARB
-       && ctx->Extensions.ARB_fragment_program) {
-      if (index >= ctx->Const.FragmentProgram.MaxEnvParams) {
-         _mesa_error(ctx, GL_INVALID_VALUE, "glGetProgramEnvParameter(index)");
-         return;
-      }
-      COPY_4V(params, ctx->FragmentProgram.Parameters[index]);
-   }
-   else if (target == GL_VERTEX_PROGRAM_ARB
-       && ctx->Extensions.ARB_vertex_program) {
-      if (index >= ctx->Const.VertexProgram.MaxEnvParams) {
-         _mesa_error(ctx, GL_INVALID_VALUE, "glGetProgramEnvParameter(index)");
-         return;
-      }
-      COPY_4V(params, ctx->VertexProgram.Parameters[index]);
-   }
-   else {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramEnvParameter(target)");
-      return;
+   if (get_env_param_pointer(ctx, "glGetProgramEnvParameterfv",
+			      target, index, &param)) {
+      COPY_4V(params, param);
    }
 }
 
@@ -547,39 +565,16 @@ _mesa_ProgramLocalParameter4fARB(GLenum target, GLuint index,
                                  GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
    GET_CURRENT_CONTEXT(ctx);
-   struct gl_program *prog;
+   GLfloat *param;
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
    FLUSH_VERTICES(ctx, _NEW_PROGRAM_CONSTANTS);
 
-   if ((target == GL_FRAGMENT_PROGRAM_NV
-        && ctx->Extensions.NV_fragment_program) ||
-       (target == GL_FRAGMENT_PROGRAM_ARB
-        && ctx->Extensions.ARB_fragment_program)) {
-      if (index >= ctx->Const.FragmentProgram.MaxLocalParams) {
-         _mesa_error(ctx, GL_INVALID_VALUE, "glProgramLocalParameterARB");
-         return;
-      }
-      prog = &(ctx->FragmentProgram.Current->Base);
-   }
-   else if (target == GL_VERTEX_PROGRAM_ARB
-            && ctx->Extensions.ARB_vertex_program) {
-      if (index >= ctx->Const.VertexProgram.MaxLocalParams) {
-         _mesa_error(ctx, GL_INVALID_VALUE, "glProgramLocalParameterARB");
-         return;
-      }
-      prog = &(ctx->VertexProgram.Current->Base);
+   if (get_local_param_pointer(ctx, "glProgramLocalParameterARB",
+			       target, index, &param)) {
+      ASSERT(index < MAX_PROGRAM_LOCAL_PARAMS);
+      ASSIGN_4V(param, x, y, z, w);
    }
-   else {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glProgramLocalParameterARB");
-      return;
-   }
-
-   ASSERT(index < MAX_PROGRAM_LOCAL_PARAMS);
-   prog->LocalParams[index][0] = x;
-   prog->LocalParams[index][1] = y;
-   prog->LocalParams[index][2] = z;
-   prog->LocalParams[index][3] = w;
 }
 
 
@@ -667,41 +662,14 @@ void GLAPIENTRY
 _mesa_GetProgramLocalParameterfvARB(GLenum target, GLuint index,
                                     GLfloat *params)
 {
-   const struct gl_program *prog;
-   GLuint maxParams;
+   GLfloat *param;
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-   if (target == GL_VERTEX_PROGRAM_ARB
-       && ctx->Extensions.ARB_vertex_program) {
-      prog = &(ctx->VertexProgram.Current->Base);
-      maxParams = ctx->Const.VertexProgram.MaxLocalParams;
-   }
-   else if (target == GL_FRAGMENT_PROGRAM_ARB
-            && ctx->Extensions.ARB_fragment_program) {
-      prog = &(ctx->FragmentProgram.Current->Base);
-      maxParams = ctx->Const.FragmentProgram.MaxLocalParams;
-   }
-   else if (target == GL_FRAGMENT_PROGRAM_NV
-            && ctx->Extensions.NV_fragment_program) {
-      prog = &(ctx->FragmentProgram.Current->Base);
-      maxParams = MAX_NV_FRAGMENT_PROGRAM_PARAMS;
-   }
-   else {
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glGetProgramLocalParameterARB(target)");
-      return;
-   }
-
-   if (index >= maxParams) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "glGetProgramLocalParameterARB(index)");
-      return;
+   if (get_local_param_pointer(ctx, "glProgramLocalParameters4fvEXT",
+				target, index, &param)) {
+      COPY_4V(params, param);
    }
-
-   ASSERT(prog);
-   ASSERT(index < MAX_PROGRAM_LOCAL_PARAMS);
-   COPY_4V(params, prog->LocalParams[index]);
 }
 
 
@@ -712,12 +680,13 @@ void GLAPIENTRY
 _mesa_GetProgramLocalParameterdvARB(GLenum target, GLuint index,
                                     GLdouble *params)
 {
+   GLfloat *param;
    GET_CURRENT_CONTEXT(ctx);
-   GLfloat floatParams[4];
-   ASSIGN_4V(floatParams, 0.0F, 0.0F, 0.0F, 0.0F);
-   _mesa_GetProgramLocalParameterfvARB(target, index, floatParams);
-   if (ctx->ErrorValue == GL_NO_ERROR) {
-      COPY_4V(params, floatParams);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (get_local_param_pointer(ctx, "glProgramLocalParameters4fvEXT",
+				target, index, &param)) {
+      COPY_4V(params, param);
    }
 }
 
diff --git a/mesalib/src/mesa/main/feedback.c b/mesalib/src/mesa/main/feedback.c
index 80565c62c..597ec1e3f 100644
--- a/mesalib/src/mesa/main/feedback.c
+++ b/mesalib/src/mesa/main/feedback.c
@@ -1,542 +1,542 @@
-/*

- * Mesa 3-D graphics library

- * Version:  7.5

- *

- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

- * Copyright (C) 2009  VMware, Inc.  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, sublicense,

- * 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 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 NONINFRINGEMENT.  IN NO EVENT SHALL

- * BRIAN PAUL 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.

- */

-

-/**

- * \file feedback.c

- * Selection and feedback modes functions.

- */

-

-

-#include "glheader.h"

-#include "colormac.h"

-#include "context.h"

-#include "enums.h"

-#include "feedback.h"

-#include "macros.h"

-#include "mfeatures.h"

-#include "mtypes.h"

-#include "main/dispatch.h"

-

-

-#if FEATURE_feedback

-

-

-#define FB_3D		0x01

-#define FB_4D		0x02

-#define FB_COLOR	0x04

-#define FB_TEXTURE	0X08

-

-

-

-static void GLAPIENTRY

-_mesa_FeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer )

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ASSERT_OUTSIDE_BEGIN_END(ctx);

-

-   if (ctx->RenderMode==GL_FEEDBACK) {

-      _mesa_error( ctx, GL_INVALID_OPERATION, "glFeedbackBuffer" );

-      return;

-   }

-   if (size<0) {

-      _mesa_error( ctx, GL_INVALID_VALUE, "glFeedbackBuffer(size<0)" );

-      return;

-   }

-   if (!buffer) {

-      _mesa_error( ctx, GL_INVALID_VALUE, "glFeedbackBuffer(buffer==NULL)" );

-      ctx->Feedback.BufferSize = 0;

-      return;

-   }

-

-   switch (type) {

-      case GL_2D:

-	 ctx->Feedback._Mask = 0;

-	 break;

-      case GL_3D:

-	 ctx->Feedback._Mask = FB_3D;

-	 break;

-      case GL_3D_COLOR:

-	 ctx->Feedback._Mask = (FB_3D | FB_COLOR);

-	 break;

-      case GL_3D_COLOR_TEXTURE:

-	 ctx->Feedback._Mask = (FB_3D | FB_COLOR | FB_TEXTURE);

-	 break;

-      case GL_4D_COLOR_TEXTURE:

-	 ctx->Feedback._Mask = (FB_3D | FB_4D | FB_COLOR | FB_TEXTURE);

-	 break;

-      default:

-         _mesa_error( ctx, GL_INVALID_ENUM, "glFeedbackBuffer" );

-	 return;

-   }

-

-   FLUSH_VERTICES(ctx, _NEW_RENDERMODE); /* Always flush */

-   ctx->Feedback.Type = type;

-   ctx->Feedback.BufferSize = size;

-   ctx->Feedback.Buffer = buffer;

-   ctx->Feedback.Count = 0;	              /* Becaues of this. */

-}

-

-

-static void GLAPIENTRY

-_mesa_PassThrough( GLfloat token )

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ASSERT_OUTSIDE_BEGIN_END(ctx);

-

-   if (ctx->RenderMode==GL_FEEDBACK) {

-      FLUSH_VERTICES(ctx, 0);

-      _mesa_feedback_token( ctx, (GLfloat) (GLint) GL_PASS_THROUGH_TOKEN );

-      _mesa_feedback_token( ctx, token );

-   }

-}

-

-

-/**

- * Put a vertex into the feedback buffer.

- */

-void

-_mesa_feedback_vertex(struct gl_context *ctx,

-                      const GLfloat win[4],

-                      const GLfloat color[4],

-                      const GLfloat texcoord[4])

-{

-   _mesa_feedback_token( ctx, win[0] );

-   _mesa_feedback_token( ctx, win[1] );

-   if (ctx->Feedback._Mask & FB_3D) {

-      _mesa_feedback_token( ctx, win[2] );

-   }

-   if (ctx->Feedback._Mask & FB_4D) {

-      _mesa_feedback_token( ctx, win[3] );

-   }

-   if (ctx->Feedback._Mask & FB_COLOR) {

-      _mesa_feedback_token( ctx, color[0] );

-      _mesa_feedback_token( ctx, color[1] );

-      _mesa_feedback_token( ctx, color[2] );

-      _mesa_feedback_token( ctx, color[3] );

-   }

-   if (ctx->Feedback._Mask & FB_TEXTURE) {

-      _mesa_feedback_token( ctx, texcoord[0] );

-      _mesa_feedback_token( ctx, texcoord[1] );

-      _mesa_feedback_token( ctx, texcoord[2] );

-      _mesa_feedback_token( ctx, texcoord[3] );

-   }

-}

-

-

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

-/** \name Selection */

-/*@{*/

-

-/**

- * Establish a buffer for selection mode values.

- * 

- * \param size buffer size.

- * \param buffer buffer.

- *

- * \sa glSelectBuffer().

- * 

- * \note this function can't be put in a display list.

- * 

- * Verifies we're not in selection mode, flushes the vertices and initialize

- * the fields in __struct gl_contextRec::Select with the given buffer.

- */

-static void GLAPIENTRY

-_mesa_SelectBuffer( GLsizei size, GLuint *buffer )

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ASSERT_OUTSIDE_BEGIN_END(ctx);

-

-   if (ctx->RenderMode==GL_SELECT) {

-      _mesa_error( ctx, GL_INVALID_OPERATION, "glSelectBuffer" );

-      return;			/* KW: added return */

-   }

-

-   FLUSH_VERTICES(ctx, _NEW_RENDERMODE); 

-   ctx->Select.Buffer = buffer;

-   ctx->Select.BufferSize = size;

-   ctx->Select.BufferCount = 0;

-   ctx->Select.HitFlag = GL_FALSE;

-   ctx->Select.HitMinZ = 1.0;

-   ctx->Select.HitMaxZ = 0.0;

-}

-

-

-/**

- * Write a value of a record into the selection buffer.

- * 

- * \param ctx GL context.

- * \param value value.

- *

- * Verifies there is free space in the buffer to write the value and

- * increments the pointer.

- */

-static INLINE void

-write_record(struct gl_context *ctx, GLuint value)

-{

-   if (ctx->Select.BufferCount < ctx->Select.BufferSize) {

-      ctx->Select.Buffer[ctx->Select.BufferCount] = value;

-   }

-   ctx->Select.BufferCount++;

-}

-

-

-/**

- * Update the hit flag and the maximum and minimum depth values.

- *

- * \param ctx GL context.

- * \param z depth.

- *

- * Sets gl_selection::HitFlag and updates gl_selection::HitMinZ and

- * gl_selection::HitMaxZ.

- */

-void

-_mesa_update_hitflag(struct gl_context *ctx, GLfloat z)

-{

-   ctx->Select.HitFlag = GL_TRUE;

-   if (z < ctx->Select.HitMinZ) {

-      ctx->Select.HitMinZ = z;

-   }

-   if (z > ctx->Select.HitMaxZ) {

-      ctx->Select.HitMaxZ = z;

-   }

-}

-

-

-/**

- * Write the hit record.

- *

- * \param ctx GL context.

- *

- * Write the hit record, i.e., the number of names in the stack, the minimum and

- * maximum depth values and the number of names in the name stack at the time

- * of the event. Resets the hit flag. 

- *

- * \sa gl_selection.

- */

-static void

-write_hit_record(struct gl_context *ctx)

-{

-   GLuint i;

-   GLuint zmin, zmax, zscale = (~0u);

-

-   /* HitMinZ and HitMaxZ are in [0,1].  Multiply these values by */

-   /* 2^32-1 and round to nearest unsigned integer. */

-

-   assert( ctx != NULL ); /* this line magically fixes a SunOS 5.x/gcc bug */

-   zmin = (GLuint) ((GLfloat) zscale * ctx->Select.HitMinZ);

-   zmax = (GLuint) ((GLfloat) zscale * ctx->Select.HitMaxZ);

-

-   write_record( ctx, ctx->Select.NameStackDepth );

-   write_record( ctx, zmin );

-   write_record( ctx, zmax );

-   for (i = 0; i < ctx->Select.NameStackDepth; i++) {

-      write_record( ctx, ctx->Select.NameStack[i] );

-   }

-

-   ctx->Select.Hits++;

-   ctx->Select.HitFlag = GL_FALSE;

-   ctx->Select.HitMinZ = 1.0;

-   ctx->Select.HitMaxZ = -1.0;

-}

-

-

-/**

- * Initialize the name stack.

- *

- * Verifies we are in select mode and resets the name stack depth and resets

- * the hit record data in gl_selection. Marks new render mode in

- * __struct gl_contextRec::NewState.

- */

-static void GLAPIENTRY

-_mesa_InitNames( void )

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);

-

-   /* Record the hit before the HitFlag is wiped out again. */

-   if (ctx->RenderMode == GL_SELECT) {

-      if (ctx->Select.HitFlag) {

-         write_hit_record( ctx );

-      }

-   }

-   ctx->Select.NameStackDepth = 0;

-   ctx->Select.HitFlag = GL_FALSE;

-   ctx->Select.HitMinZ = 1.0;

-   ctx->Select.HitMaxZ = 0.0;

-   ctx->NewState |= _NEW_RENDERMODE;

-}

-

-

-/**

- * Load the top-most name of the name stack.

- *

- * \param name name.

- *

- * Verifies we are in selection mode and that the name stack is not empty.

- * Flushes vertices. If there is a hit flag writes it (via write_hit_record()),

- * and replace the top-most name in the stack.

- *

- * sa __struct gl_contextRec::Select.

- */

-static void GLAPIENTRY

-_mesa_LoadName( GLuint name )

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ASSERT_OUTSIDE_BEGIN_END(ctx);

-

-   if (ctx->RenderMode != GL_SELECT) {

-      return;

-   }

-   if (ctx->Select.NameStackDepth == 0) {

-      _mesa_error( ctx, GL_INVALID_OPERATION, "glLoadName" );

-      return;

-   }

-

-   FLUSH_VERTICES(ctx, _NEW_RENDERMODE);

-

-   if (ctx->Select.HitFlag) {

-      write_hit_record( ctx );

-   }

-   if (ctx->Select.NameStackDepth < MAX_NAME_STACK_DEPTH) {

-      ctx->Select.NameStack[ctx->Select.NameStackDepth-1] = name;

-   }

-   else {

-      ctx->Select.NameStack[MAX_NAME_STACK_DEPTH-1] = name;

-   }

-}

-

-

-/**

- * Push a name into the name stack.

- *

- * \param name name.

- *

- * Verifies we are in selection mode and that the name stack is not full.

- * Flushes vertices. If there is a hit flag writes it (via write_hit_record()),

- * and adds the name to the top of the name stack.

- *

- * sa __struct gl_contextRec::Select.

- */

-static void GLAPIENTRY

-_mesa_PushName( GLuint name )

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ASSERT_OUTSIDE_BEGIN_END(ctx);

-

-   if (ctx->RenderMode != GL_SELECT) {

-      return;

-   }

-

-   FLUSH_VERTICES(ctx, _NEW_RENDERMODE);

-   if (ctx->Select.HitFlag) {

-      write_hit_record( ctx );

-   }

-   if (ctx->Select.NameStackDepth >= MAX_NAME_STACK_DEPTH) {

-      _mesa_error( ctx, GL_STACK_OVERFLOW, "glPushName" );

-   }

-   else

-      ctx->Select.NameStack[ctx->Select.NameStackDepth++] = name;

-}

-

-

-/**

- * Pop a name into the name stack.

- *

- * Verifies we are in selection mode and that the name stack is not empty.

- * Flushes vertices. If there is a hit flag writes it (via write_hit_record()),

- * and removes top-most name in the name stack.

- *

- * sa __struct gl_contextRec::Select.

- */

-static void GLAPIENTRY

-_mesa_PopName( void )

-{

-   GET_CURRENT_CONTEXT(ctx);

-   ASSERT_OUTSIDE_BEGIN_END(ctx);

-

-   if (ctx->RenderMode != GL_SELECT) {

-      return;

-   }

-

-   FLUSH_VERTICES(ctx, _NEW_RENDERMODE);

-   if (ctx->Select.HitFlag) {

-      write_hit_record( ctx );

-   }

-   if (ctx->Select.NameStackDepth == 0) {

-      _mesa_error( ctx, GL_STACK_UNDERFLOW, "glPopName" );

-   }

-   else

-      ctx->Select.NameStackDepth--;

-}

-

-/*@}*/

-

-

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

-/** \name Render Mode */

-/*@{*/

-

-/**

- * Set rasterization mode.

- *

- * \param mode rasterization mode.

- *

- * \note this function can't be put in a display list.

- *

- * \sa glRenderMode().

- * 

- * Flushes the vertices and do the necessary cleanup according to the previous

- * rasterization mode, such as writing the hit record or resent the select

- * buffer index when exiting the select mode. Updates

- * __struct gl_contextRec::RenderMode and notifies the driver via the

- * dd_function_table::RenderMode callback.

- */

-static GLint GLAPIENTRY

-_mesa_RenderMode( GLenum mode )

-{

-   GET_CURRENT_CONTEXT(ctx);

-   GLint result;

-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);

-

-   if (MESA_VERBOSE & VERBOSE_API)

-      _mesa_debug(ctx, "glRenderMode %s\n", _mesa_lookup_enum_by_nr(mode));

-

-   FLUSH_VERTICES(ctx, _NEW_RENDERMODE);

-

-   switch (ctx->RenderMode) {

-      case GL_RENDER:

-	 result = 0;

-	 break;

-      case GL_SELECT:

-	 if (ctx->Select.HitFlag) {

-	    write_hit_record( ctx );

-	 }

-	 if (ctx->Select.BufferCount > ctx->Select.BufferSize) {

-	    /* overflow */

-#ifdef DEBUG

-            _mesa_warning(ctx, "Feedback buffer overflow");

-#endif

-	    result = -1;

-	 }

-	 else {

-	    result = ctx->Select.Hits;

-	 }

-	 ctx->Select.BufferCount = 0;

-	 ctx->Select.Hits = 0;

-	 ctx->Select.NameStackDepth = 0;

-	 break;

-#if _HAVE_FULL_GL

-      case GL_FEEDBACK:

-	 if (ctx->Feedback.Count > ctx->Feedback.BufferSize) {

-	    /* overflow */

-	    result = -1;

-	 }

-	 else {

-	    result = ctx->Feedback.Count;

-	 }

-	 ctx->Feedback.Count = 0;

-	 break;

-#endif

-      default:

-	 _mesa_error( ctx, GL_INVALID_ENUM, "glRenderMode" );

-	 return 0;

-   }

-

-   switch (mode) {

-      case GL_RENDER:

-         break;

-      case GL_SELECT:

-	 if (ctx->Select.BufferSize==0) {

-	    /* haven't called glSelectBuffer yet */

-	    _mesa_error( ctx, GL_INVALID_OPERATION, "glRenderMode" );

-	 }

-	 break;

-#if _HAVE_FULL_GL

-      case GL_FEEDBACK:

-	 if (ctx->Feedback.BufferSize==0) {

-	    /* haven't called glFeedbackBuffer yet */

-	    _mesa_error( ctx, GL_INVALID_OPERATION, "glRenderMode" );

-	 }

-	 break;

-#endif

-      default:

-	 _mesa_error( ctx, GL_INVALID_ENUM, "glRenderMode" );

-	 return 0;

-   }

-

-   ctx->RenderMode = mode;

-   if (ctx->Driver.RenderMode)

-      ctx->Driver.RenderMode( ctx, mode );

-

-   return result;

-}

-

-/*@}*/

-

-

-void

-_mesa_init_feedback_dispatch(struct _glapi_table *disp)

-{

-   SET_InitNames(disp, _mesa_InitNames);

-   SET_FeedbackBuffer(disp, _mesa_FeedbackBuffer);

-   SET_LoadName(disp, _mesa_LoadName);

-   SET_PassThrough(disp, _mesa_PassThrough);

-   SET_PopName(disp, _mesa_PopName);

-   SET_PushName(disp, _mesa_PushName);

-   SET_SelectBuffer(disp, _mesa_SelectBuffer);

-   SET_RenderMode(disp, _mesa_RenderMode);

-}

-

-

-#endif /* FEATURE_feedback */

-

-

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

-/** \name Initialization */

-/*@{*/

-

-/**

- * Initialize context feedback data.

- */

-void _mesa_init_feedback( struct gl_context * ctx )

-{

-   /* Feedback */

-   ctx->Feedback.Type = GL_2D;   /* TODO: verify */

-   ctx->Feedback.Buffer = NULL;

-   ctx->Feedback.BufferSize = 0;

-   ctx->Feedback.Count = 0;

-

-   /* Selection/picking */

-   ctx->Select.Buffer = NULL;

-   ctx->Select.BufferSize = 0;

-   ctx->Select.BufferCount = 0;

-   ctx->Select.Hits = 0;

-   ctx->Select.NameStackDepth = 0;

-

-   /* Miscellaneous */

-   ctx->RenderMode = GL_RENDER;

-}

-

-/*@}*/

+/*
+ * Mesa 3-D graphics library
+ * Version:  7.5
+ *
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009  VMware, Inc.  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, sublicense,
+ * 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 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 NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL 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.
+ */
+
+/**
+ * \file feedback.c
+ * Selection and feedback modes functions.
+ */
+
+
+#include "glheader.h"
+#include "colormac.h"
+#include "context.h"
+#include "enums.h"
+#include "feedback.h"
+#include "macros.h"
+#include "mfeatures.h"
+#include "mtypes.h"
+#include "main/dispatch.h"
+
+
+#if FEATURE_feedback
+
+
+#define FB_3D		0x01
+#define FB_4D		0x02
+#define FB_COLOR	0x04
+#define FB_TEXTURE	0X08
+
+
+
+static void GLAPIENTRY
+_mesa_FeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (ctx->RenderMode==GL_FEEDBACK) {
+      _mesa_error( ctx, GL_INVALID_OPERATION, "glFeedbackBuffer" );
+      return;
+   }
+   if (size<0) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glFeedbackBuffer(size<0)" );
+      return;
+   }
+   if (!buffer && size > 0) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glFeedbackBuffer(buffer==NULL)" );
+      ctx->Feedback.BufferSize = 0;
+      return;
+   }
+
+   switch (type) {
+      case GL_2D:
+	 ctx->Feedback._Mask = 0;
+	 break;
+      case GL_3D:
+	 ctx->Feedback._Mask = FB_3D;
+	 break;
+      case GL_3D_COLOR:
+	 ctx->Feedback._Mask = (FB_3D | FB_COLOR);
+	 break;
+      case GL_3D_COLOR_TEXTURE:
+	 ctx->Feedback._Mask = (FB_3D | FB_COLOR | FB_TEXTURE);
+	 break;
+      case GL_4D_COLOR_TEXTURE:
+	 ctx->Feedback._Mask = (FB_3D | FB_4D | FB_COLOR | FB_TEXTURE);
+	 break;
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glFeedbackBuffer" );
+	 return;
+   }
+
+   FLUSH_VERTICES(ctx, _NEW_RENDERMODE); /* Always flush */
+   ctx->Feedback.Type = type;
+   ctx->Feedback.BufferSize = size;
+   ctx->Feedback.Buffer = buffer;
+   ctx->Feedback.Count = 0;	              /* Becaues of this. */
+}
+
+
+static void GLAPIENTRY
+_mesa_PassThrough( GLfloat token )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (ctx->RenderMode==GL_FEEDBACK) {
+      FLUSH_VERTICES(ctx, 0);
+      _mesa_feedback_token( ctx, (GLfloat) (GLint) GL_PASS_THROUGH_TOKEN );
+      _mesa_feedback_token( ctx, token );
+   }
+}
+
+
+/**
+ * Put a vertex into the feedback buffer.
+ */
+void
+_mesa_feedback_vertex(struct gl_context *ctx,
+                      const GLfloat win[4],
+                      const GLfloat color[4],
+                      const GLfloat texcoord[4])
+{
+   _mesa_feedback_token( ctx, win[0] );
+   _mesa_feedback_token( ctx, win[1] );
+   if (ctx->Feedback._Mask & FB_3D) {
+      _mesa_feedback_token( ctx, win[2] );
+   }
+   if (ctx->Feedback._Mask & FB_4D) {
+      _mesa_feedback_token( ctx, win[3] );
+   }
+   if (ctx->Feedback._Mask & FB_COLOR) {
+      _mesa_feedback_token( ctx, color[0] );
+      _mesa_feedback_token( ctx, color[1] );
+      _mesa_feedback_token( ctx, color[2] );
+      _mesa_feedback_token( ctx, color[3] );
+   }
+   if (ctx->Feedback._Mask & FB_TEXTURE) {
+      _mesa_feedback_token( ctx, texcoord[0] );
+      _mesa_feedback_token( ctx, texcoord[1] );
+      _mesa_feedback_token( ctx, texcoord[2] );
+      _mesa_feedback_token( ctx, texcoord[3] );
+   }
+}
+
+
+/**********************************************************************/
+/** \name Selection */
+/*@{*/
+
+/**
+ * Establish a buffer for selection mode values.
+ * 
+ * \param size buffer size.
+ * \param buffer buffer.
+ *
+ * \sa glSelectBuffer().
+ * 
+ * \note this function can't be put in a display list.
+ * 
+ * Verifies we're not in selection mode, flushes the vertices and initialize
+ * the fields in __struct gl_contextRec::Select with the given buffer.
+ */
+static void GLAPIENTRY
+_mesa_SelectBuffer( GLsizei size, GLuint *buffer )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (ctx->RenderMode==GL_SELECT) {
+      _mesa_error( ctx, GL_INVALID_OPERATION, "glSelectBuffer" );
+      return;			/* KW: added return */
+   }
+
+   FLUSH_VERTICES(ctx, _NEW_RENDERMODE); 
+   ctx->Select.Buffer = buffer;
+   ctx->Select.BufferSize = size;
+   ctx->Select.BufferCount = 0;
+   ctx->Select.HitFlag = GL_FALSE;
+   ctx->Select.HitMinZ = 1.0;
+   ctx->Select.HitMaxZ = 0.0;
+}
+
+
+/**
+ * Write a value of a record into the selection buffer.
+ * 
+ * \param ctx GL context.
+ * \param value value.
+ *
+ * Verifies there is free space in the buffer to write the value and
+ * increments the pointer.
+ */
+static INLINE void
+write_record(struct gl_context *ctx, GLuint value)
+{
+   if (ctx->Select.BufferCount < ctx->Select.BufferSize) {
+      ctx->Select.Buffer[ctx->Select.BufferCount] = value;
+   }
+   ctx->Select.BufferCount++;
+}
+
+
+/**
+ * Update the hit flag and the maximum and minimum depth values.
+ *
+ * \param ctx GL context.
+ * \param z depth.
+ *
+ * Sets gl_selection::HitFlag and updates gl_selection::HitMinZ and
+ * gl_selection::HitMaxZ.
+ */
+void
+_mesa_update_hitflag(struct gl_context *ctx, GLfloat z)
+{
+   ctx->Select.HitFlag = GL_TRUE;
+   if (z < ctx->Select.HitMinZ) {
+      ctx->Select.HitMinZ = z;
+   }
+   if (z > ctx->Select.HitMaxZ) {
+      ctx->Select.HitMaxZ = z;
+   }
+}
+
+
+/**
+ * Write the hit record.
+ *
+ * \param ctx GL context.
+ *
+ * Write the hit record, i.e., the number of names in the stack, the minimum and
+ * maximum depth values and the number of names in the name stack at the time
+ * of the event. Resets the hit flag. 
+ *
+ * \sa gl_selection.
+ */
+static void
+write_hit_record(struct gl_context *ctx)
+{
+   GLuint i;
+   GLuint zmin, zmax, zscale = (~0u);
+
+   /* HitMinZ and HitMaxZ are in [0,1].  Multiply these values by */
+   /* 2^32-1 and round to nearest unsigned integer. */
+
+   assert( ctx != NULL ); /* this line magically fixes a SunOS 5.x/gcc bug */
+   zmin = (GLuint) ((GLfloat) zscale * ctx->Select.HitMinZ);
+   zmax = (GLuint) ((GLfloat) zscale * ctx->Select.HitMaxZ);
+
+   write_record( ctx, ctx->Select.NameStackDepth );
+   write_record( ctx, zmin );
+   write_record( ctx, zmax );
+   for (i = 0; i < ctx->Select.NameStackDepth; i++) {
+      write_record( ctx, ctx->Select.NameStack[i] );
+   }
+
+   ctx->Select.Hits++;
+   ctx->Select.HitFlag = GL_FALSE;
+   ctx->Select.HitMinZ = 1.0;
+   ctx->Select.HitMaxZ = -1.0;
+}
+
+
+/**
+ * Initialize the name stack.
+ *
+ * Verifies we are in select mode and resets the name stack depth and resets
+ * the hit record data in gl_selection. Marks new render mode in
+ * __struct gl_contextRec::NewState.
+ */
+static void GLAPIENTRY
+_mesa_InitNames( void )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+
+   /* Record the hit before the HitFlag is wiped out again. */
+   if (ctx->RenderMode == GL_SELECT) {
+      if (ctx->Select.HitFlag) {
+         write_hit_record( ctx );
+      }
+   }
+   ctx->Select.NameStackDepth = 0;
+   ctx->Select.HitFlag = GL_FALSE;
+   ctx->Select.HitMinZ = 1.0;
+   ctx->Select.HitMaxZ = 0.0;
+   ctx->NewState |= _NEW_RENDERMODE;
+}
+
+
+/**
+ * Load the top-most name of the name stack.
+ *
+ * \param name name.
+ *
+ * Verifies we are in selection mode and that the name stack is not empty.
+ * Flushes vertices. If there is a hit flag writes it (via write_hit_record()),
+ * and replace the top-most name in the stack.
+ *
+ * sa __struct gl_contextRec::Select.
+ */
+static void GLAPIENTRY
+_mesa_LoadName( GLuint name )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (ctx->RenderMode != GL_SELECT) {
+      return;
+   }
+   if (ctx->Select.NameStackDepth == 0) {
+      _mesa_error( ctx, GL_INVALID_OPERATION, "glLoadName" );
+      return;
+   }
+
+   FLUSH_VERTICES(ctx, _NEW_RENDERMODE);
+
+   if (ctx->Select.HitFlag) {
+      write_hit_record( ctx );
+   }
+   if (ctx->Select.NameStackDepth < MAX_NAME_STACK_DEPTH) {
+      ctx->Select.NameStack[ctx->Select.NameStackDepth-1] = name;
+   }
+   else {
+      ctx->Select.NameStack[MAX_NAME_STACK_DEPTH-1] = name;
+   }
+}
+
+
+/**
+ * Push a name into the name stack.
+ *
+ * \param name name.
+ *
+ * Verifies we are in selection mode and that the name stack is not full.
+ * Flushes vertices. If there is a hit flag writes it (via write_hit_record()),
+ * and adds the name to the top of the name stack.
+ *
+ * sa __struct gl_contextRec::Select.
+ */
+static void GLAPIENTRY
+_mesa_PushName( GLuint name )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (ctx->RenderMode != GL_SELECT) {
+      return;
+   }
+
+   FLUSH_VERTICES(ctx, _NEW_RENDERMODE);
+   if (ctx->Select.HitFlag) {
+      write_hit_record( ctx );
+   }
+   if (ctx->Select.NameStackDepth >= MAX_NAME_STACK_DEPTH) {
+      _mesa_error( ctx, GL_STACK_OVERFLOW, "glPushName" );
+   }
+   else
+      ctx->Select.NameStack[ctx->Select.NameStackDepth++] = name;
+}
+
+
+/**
+ * Pop a name into the name stack.
+ *
+ * Verifies we are in selection mode and that the name stack is not empty.
+ * Flushes vertices. If there is a hit flag writes it (via write_hit_record()),
+ * and removes top-most name in the name stack.
+ *
+ * sa __struct gl_contextRec::Select.
+ */
+static void GLAPIENTRY
+_mesa_PopName( void )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (ctx->RenderMode != GL_SELECT) {
+      return;
+   }
+
+   FLUSH_VERTICES(ctx, _NEW_RENDERMODE);
+   if (ctx->Select.HitFlag) {
+      write_hit_record( ctx );
+   }
+   if (ctx->Select.NameStackDepth == 0) {
+      _mesa_error( ctx, GL_STACK_UNDERFLOW, "glPopName" );
+   }
+   else
+      ctx->Select.NameStackDepth--;
+}
+
+/*@}*/
+
+
+/**********************************************************************/
+/** \name Render Mode */
+/*@{*/
+
+/**
+ * Set rasterization mode.
+ *
+ * \param mode rasterization mode.
+ *
+ * \note this function can't be put in a display list.
+ *
+ * \sa glRenderMode().
+ * 
+ * Flushes the vertices and do the necessary cleanup according to the previous
+ * rasterization mode, such as writing the hit record or resent the select
+ * buffer index when exiting the select mode. Updates
+ * __struct gl_contextRec::RenderMode and notifies the driver via the
+ * dd_function_table::RenderMode callback.
+ */
+static GLint GLAPIENTRY
+_mesa_RenderMode( GLenum mode )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLint result;
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glRenderMode %s\n", _mesa_lookup_enum_by_nr(mode));
+
+   FLUSH_VERTICES(ctx, _NEW_RENDERMODE);
+
+   switch (ctx->RenderMode) {
+      case GL_RENDER:
+	 result = 0;
+	 break;
+      case GL_SELECT:
+	 if (ctx->Select.HitFlag) {
+	    write_hit_record( ctx );
+	 }
+	 if (ctx->Select.BufferCount > ctx->Select.BufferSize) {
+	    /* overflow */
+#ifdef DEBUG
+            _mesa_warning(ctx, "Feedback buffer overflow");
+#endif
+	    result = -1;
+	 }
+	 else {
+	    result = ctx->Select.Hits;
+	 }
+	 ctx->Select.BufferCount = 0;
+	 ctx->Select.Hits = 0;
+	 ctx->Select.NameStackDepth = 0;
+	 break;
+#if _HAVE_FULL_GL
+      case GL_FEEDBACK:
+	 if (ctx->Feedback.Count > ctx->Feedback.BufferSize) {
+	    /* overflow */
+	    result = -1;
+	 }
+	 else {
+	    result = ctx->Feedback.Count;
+	 }
+	 ctx->Feedback.Count = 0;
+	 break;
+#endif
+      default:
+	 _mesa_error( ctx, GL_INVALID_ENUM, "glRenderMode" );
+	 return 0;
+   }
+
+   switch (mode) {
+      case GL_RENDER:
+         break;
+      case GL_SELECT:
+	 if (ctx->Select.BufferSize==0) {
+	    /* haven't called glSelectBuffer yet */
+	    _mesa_error( ctx, GL_INVALID_OPERATION, "glRenderMode" );
+	 }
+	 break;
+#if _HAVE_FULL_GL
+      case GL_FEEDBACK:
+	 if (ctx->Feedback.BufferSize==0) {
+	    /* haven't called glFeedbackBuffer yet */
+	    _mesa_error( ctx, GL_INVALID_OPERATION, "glRenderMode" );
+	 }
+	 break;
+#endif
+      default:
+	 _mesa_error( ctx, GL_INVALID_ENUM, "glRenderMode" );
+	 return 0;
+   }
+
+   ctx->RenderMode = mode;
+   if (ctx->Driver.RenderMode)
+      ctx->Driver.RenderMode( ctx, mode );
+
+   return result;
+}
+
+/*@}*/
+
+
+void
+_mesa_init_feedback_dispatch(struct _glapi_table *disp)
+{
+   SET_InitNames(disp, _mesa_InitNames);
+   SET_FeedbackBuffer(disp, _mesa_FeedbackBuffer);
+   SET_LoadName(disp, _mesa_LoadName);
+   SET_PassThrough(disp, _mesa_PassThrough);
+   SET_PopName(disp, _mesa_PopName);
+   SET_PushName(disp, _mesa_PushName);
+   SET_SelectBuffer(disp, _mesa_SelectBuffer);
+   SET_RenderMode(disp, _mesa_RenderMode);
+}
+
+
+#endif /* FEATURE_feedback */
+
+
+/**********************************************************************/
+/** \name Initialization */
+/*@{*/
+
+/**
+ * Initialize context feedback data.
+ */
+void _mesa_init_feedback( struct gl_context * ctx )
+{
+   /* Feedback */
+   ctx->Feedback.Type = GL_2D;   /* TODO: verify */
+   ctx->Feedback.Buffer = NULL;
+   ctx->Feedback.BufferSize = 0;
+   ctx->Feedback.Count = 0;
+
+   /* Selection/picking */
+   ctx->Select.Buffer = NULL;
+   ctx->Select.BufferSize = 0;
+   ctx->Select.BufferCount = 0;
+   ctx->Select.Hits = 0;
+   ctx->Select.NameStackDepth = 0;
+
+   /* Miscellaneous */
+   ctx->RenderMode = GL_RENDER;
+}
+
+/*@}*/
diff --git a/mesalib/src/mesa/main/texstore.c b/mesalib/src/mesa/main/texstore.c
index 5c925a3d3..e527981ff 100644
--- a/mesalib/src/mesa/main/texstore.c
+++ b/mesalib/src/mesa/main/texstore.c
@@ -3303,8 +3303,7 @@ _mesa_texstore_z24_s8(TEXSTORE_PARAMS)
 {
    const GLuint depthScale = 0xffffff;
    const GLint srcRowStride
-      = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType)
-      / sizeof(GLuint);
+      = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType);
    GLint img, row;
 
    ASSERT(dstFormat == MESA_FORMAT_Z24_S8);
@@ -3332,8 +3331,8 @@ _mesa_texstore_z24_s8(TEXSTORE_PARAMS)
             + dstImageOffsets[dstZoffset + img]
             + dstYoffset * dstRowStride / sizeof(GLuint)
             + dstXoffset;
-         const GLuint *src
-            = (const GLuint *) _mesa_image_address(dims, srcPacking, srcAddr,
+         const GLubyte *src
+            = (const GLubyte *) _mesa_image_address(dims, srcPacking, srcAddr,
                   srcWidth, srcHeight,
                   srcFormat, srcType,
                   img, 0, 0);
@@ -3390,8 +3389,7 @@ _mesa_texstore_s8_z24(TEXSTORE_PARAMS)
 {
    const GLuint depthScale = 0xffffff;
    const GLint srcRowStride
-      = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType)
-      / sizeof(GLuint);
+      = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType);
    GLint img, row;
 
    ASSERT(dstFormat == MESA_FORMAT_S8_Z24);
@@ -3406,8 +3404,8 @@ _mesa_texstore_s8_z24(TEXSTORE_PARAMS)
 	 + dstImageOffsets[dstZoffset + img]
 	 + dstYoffset * dstRowStride / sizeof(GLuint)
 	 + dstXoffset;
-      const GLuint *src
-	 = (const GLuint *) _mesa_image_address(dims, srcPacking, srcAddr,
+      const GLubyte *src
+	 = (const GLubyte *) _mesa_image_address(dims, srcPacking, srcAddr,
 						srcWidth, srcHeight,
 						srcFormat, srcType,
 						img, 0, 0);
@@ -3479,8 +3477,7 @@ _mesa_texstore_s8(TEXSTORE_PARAMS)
    }
    else {
       const GLint srcRowStride
-	 = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType)
-	 / sizeof(GLuint);
+	 = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType);
       GLint img, row;
       
       for (img = 0; img < srcDepth; img++) {
@@ -3488,8 +3485,8 @@ _mesa_texstore_s8(TEXSTORE_PARAMS)
             + dstImageOffsets[dstZoffset + img]
             + dstYoffset * dstRowStride / sizeof(GLuint)
             + dstXoffset;
-         const GLuint *src
-            = (const GLuint *) _mesa_image_address(dims, srcPacking, srcAddr,
+         const GLubyte *src
+            = (const GLubyte *) _mesa_image_address(dims, srcPacking, srcAddr,
                                                    srcWidth, srcHeight,
                                                    srcFormat, srcType,
                                                    img, 0, 0);