Synchronised line endinge with release branch

1 files changed, 270 insertions, 270 deletions

diff --git a/mesalib/src/mesa/main/getstring.c b/mesalib/src/mesa/main/getstring.c
index 2052cbc6c..c381fb2df 100644
--- a/mesalib/src/mesa/main/getstring.c
+++ b/mesalib/src/mesa/main/getstring.c
@@ -1,270 +1,270 @@
-/*

- * Mesa 3-D graphics library

- * Version:  7.1

- *

- * Copyright (C) 1999-2008  Brian Paul   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.

- */

-

-

-

-#include "glheader.h"

-#include "context.h"

-#include "get.h"

-#include "enums.h"

-#include "extensions.h"

-#include "mfeatures.h"

-#include "mtypes.h"

-

-

-/**

- * Return the string for a glGetString(GL_SHADING_LANGUAGE_VERSION) query.

- */

-static const GLubyte *

-shading_language_version(struct gl_context *ctx)

-{

-   switch (ctx->API) {

-   case API_OPENGL:

-      if (!ctx->Extensions.ARB_shader_objects) {

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

-         return (const GLubyte *) 0;

-      }

-

-      switch (ctx->Const.GLSLVersion) {

-      case 110:

-         return (const GLubyte *) "1.10";

-      case 120:

-         return (const GLubyte *) "1.20";

-      case 130:

-         return (const GLubyte *) "1.30";

-      default:

-         _mesa_problem(ctx,

-                       "Invalid GLSL version in shading_language_version()");

-         return (const GLubyte *) 0;

-      }

-      break;

-

-   case API_OPENGLES2:

-      return (const GLubyte *) "OpenGL ES GLSL ES 1.0.16";

-

-   case API_OPENGLES:

-      /* fall-through */

-

-   default:

-      _mesa_problem(ctx, "Unexpected API value in shading_language_version()");

-      return (const GLubyte *) 0;

-   }

-}

-

-

-/**

- * Query string-valued state.  The return value should _not_ be freed by

- * the caller.

- *

- * \param name  the state variable to query.

- *

- * \sa glGetString().

- *

- * Tries to get the string from dd_function_table::GetString, otherwise returns

- * the hardcoded strings.

- */

-const GLubyte * GLAPIENTRY

-_mesa_GetString( GLenum name )

-{

-   GET_CURRENT_CONTEXT(ctx);

-   static const char *vendor = "Brian Paul";

-   static const char *renderer = "Mesa";

-

-   if (!ctx)

-      return NULL;

-

-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, NULL);

-

-   /* this is a required driver function */

-   assert(ctx->Driver.GetString);

-   {

-      /* Give the driver the chance to handle this query */

-      const GLubyte *str = (*ctx->Driver.GetString)(ctx, name);

-      if (str)

-         return str;

-   }

-

-   switch (name) {

-      case GL_VENDOR:

-         return (const GLubyte *) vendor;

-      case GL_RENDERER:

-         return (const GLubyte *) renderer;

-      case GL_VERSION:

-         return (const GLubyte *) ctx->VersionString;

-      case GL_EXTENSIONS:

-         return (const GLubyte *) ctx->Extensions.String;

-#if FEATURE_ARB_shading_language_100 || FEATURE_ES2

-      case GL_SHADING_LANGUAGE_VERSION:

-	 return shading_language_version(ctx);

-#endif

-#if FEATURE_NV_fragment_program || FEATURE_ARB_fragment_program || \

-    FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program

-      case GL_PROGRAM_ERROR_STRING_NV:

-         if (ctx->Extensions.NV_fragment_program ||

-             ctx->Extensions.ARB_fragment_program ||

-             ctx->Extensions.NV_vertex_program ||

-             ctx->Extensions.ARB_vertex_program) {

-            return (const GLubyte *) ctx->Program.ErrorString;

-         }

-         /* FALL-THROUGH */

-#endif

-      default:

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

-         return (const GLubyte *) 0;

-   }

-}

-

-

-/**

- * GL3

- */

-const GLubyte * GLAPIENTRY

-_mesa_GetStringi(GLenum name, GLuint index)

-{

-   GET_CURRENT_CONTEXT(ctx);

-

-   if (!ctx)

-      return NULL;

-

-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, NULL);

-

-   switch (name) {

-   case GL_EXTENSIONS:

-      if (index >= _mesa_get_extension_count(ctx)) {

-         _mesa_error(ctx, GL_INVALID_VALUE, "glGetStringi(index=%u)", index);

-         return (const GLubyte *) 0;

-      }

-      return _mesa_get_enabled_extension(ctx, index);

-   default:

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

-      return (const GLubyte *) 0;

-   }

-}

-

-

-

-/**

- * Return pointer-valued state, such as a vertex array pointer.

- *

- * \param pname  names state to be queried

- * \param params  returns the pointer value

- *

- * \sa glGetPointerv().

- *

- * Tries to get the specified pointer via dd_function_table::GetPointerv,

- * otherwise gets the specified pointer from the current context.

- */

-void GLAPIENTRY

-_mesa_GetPointerv( GLenum pname, GLvoid **params )

-{

-   GET_CURRENT_CONTEXT(ctx);

-   const GLuint clientUnit = ctx->Array.ActiveTexture;

-   ASSERT_OUTSIDE_BEGIN_END(ctx);

-

-   if (!params)

-      return;

-

-   if (MESA_VERBOSE & VERBOSE_API)

-      _mesa_debug(ctx, "glGetPointerv %s\n", _mesa_lookup_enum_by_nr(pname));

-

-   switch (pname) {

-      case GL_VERTEX_ARRAY_POINTER:

-         *params = (GLvoid *) ctx->Array.ArrayObj->Vertex.Ptr;

-         break;

-      case GL_NORMAL_ARRAY_POINTER:

-         *params = (GLvoid *) ctx->Array.ArrayObj->Normal.Ptr;

-         break;

-      case GL_COLOR_ARRAY_POINTER:

-         *params = (GLvoid *) ctx->Array.ArrayObj->Color.Ptr;

-         break;

-      case GL_SECONDARY_COLOR_ARRAY_POINTER_EXT:

-         *params = (GLvoid *) ctx->Array.ArrayObj->SecondaryColor.Ptr;

-         break;

-      case GL_FOG_COORDINATE_ARRAY_POINTER_EXT:

-         *params = (GLvoid *) ctx->Array.ArrayObj->FogCoord.Ptr;

-         break;

-      case GL_INDEX_ARRAY_POINTER:

-         *params = (GLvoid *) ctx->Array.ArrayObj->Index.Ptr;

-         break;

-      case GL_TEXTURE_COORD_ARRAY_POINTER:

-         *params = (GLvoid *) ctx->Array.ArrayObj->TexCoord[clientUnit].Ptr;

-         break;

-      case GL_EDGE_FLAG_ARRAY_POINTER:

-         *params = (GLvoid *) ctx->Array.ArrayObj->EdgeFlag.Ptr;

-         break;

-      case GL_FEEDBACK_BUFFER_POINTER:

-         *params = ctx->Feedback.Buffer;

-         break;

-      case GL_SELECTION_BUFFER_POINTER:

-         *params = ctx->Select.Buffer;

-         break;

-#if FEATURE_point_size_array

-      case GL_POINT_SIZE_ARRAY_POINTER_OES:

-         *params = (GLvoid *) ctx->Array.ArrayObj->PointSize.Ptr;

-         break;

-#endif

-      default:

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

-         return;

-   }

-}

-

-

-/**

- * Returns the current GL error code, or GL_NO_ERROR.

- * \return current error code

- *

- * Returns __struct gl_contextRec::ErrorValue.

- */

-GLenum GLAPIENTRY

-_mesa_GetError( void )

-{

-   GET_CURRENT_CONTEXT(ctx);

-   GLenum e = ctx->ErrorValue;

-   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);

-

-   if (MESA_VERBOSE & VERBOSE_API)

-      _mesa_debug(ctx, "glGetError <-- %s\n", _mesa_lookup_enum_by_nr(e));

-

-   ctx->ErrorValue = (GLenum) GL_NO_ERROR;

-   ctx->ErrorDebugCount = 0;

-   return e;

-}

-

-/**

- * Returns an error code specified by GL_ARB_robustness, or GL_NO_ERROR.

- * \return current context status

- */

-GLenum GLAPIENTRY

-_mesa_GetGraphicsResetStatusARB( void )

-{

-   GET_CURRENT_CONTEXT(ctx);

-   GLenum status = ctx->ResetStatus;

-

-   if (MESA_VERBOSE & VERBOSE_API)

-      _mesa_debug(ctx, "glGetGraphicsResetStatusARB"

-                       "(always returns GL_NO_ERROR)\n");

-

-   return status;

-}

+/*
+ * Mesa 3-D graphics library
+ * Version:  7.1
+ *
+ * Copyright (C) 1999-2008  Brian Paul   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.
+ */
+
+
+
+#include "glheader.h"
+#include "context.h"
+#include "get.h"
+#include "enums.h"
+#include "extensions.h"
+#include "mfeatures.h"
+#include "mtypes.h"
+
+
+/**
+ * Return the string for a glGetString(GL_SHADING_LANGUAGE_VERSION) query.
+ */
+static const GLubyte *
+shading_language_version(struct gl_context *ctx)
+{
+   switch (ctx->API) {
+   case API_OPENGL:
+      if (!ctx->Extensions.ARB_shader_objects) {
+         _mesa_error(ctx, GL_INVALID_ENUM, "glGetString");
+         return (const GLubyte *) 0;
+      }
+
+      switch (ctx->Const.GLSLVersion) {
+      case 110:
+         return (const GLubyte *) "1.10";
+      case 120:
+         return (const GLubyte *) "1.20";
+      case 130:
+         return (const GLubyte *) "1.30";
+      default:
+         _mesa_problem(ctx,
+                       "Invalid GLSL version in shading_language_version()");
+         return (const GLubyte *) 0;
+      }
+      break;
+
+   case API_OPENGLES2:
+      return (const GLubyte *) "OpenGL ES GLSL ES 1.0.16";
+
+   case API_OPENGLES:
+      /* fall-through */
+
+   default:
+      _mesa_problem(ctx, "Unexpected API value in shading_language_version()");
+      return (const GLubyte *) 0;
+   }
+}
+
+
+/**
+ * Query string-valued state.  The return value should _not_ be freed by
+ * the caller.
+ *
+ * \param name  the state variable to query.
+ *
+ * \sa glGetString().
+ *
+ * Tries to get the string from dd_function_table::GetString, otherwise returns
+ * the hardcoded strings.
+ */
+const GLubyte * GLAPIENTRY
+_mesa_GetString( GLenum name )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   static const char *vendor = "Brian Paul";
+   static const char *renderer = "Mesa";
+
+   if (!ctx)
+      return NULL;
+
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, NULL);
+
+   /* this is a required driver function */
+   assert(ctx->Driver.GetString);
+   {
+      /* Give the driver the chance to handle this query */
+      const GLubyte *str = (*ctx->Driver.GetString)(ctx, name);
+      if (str)
+         return str;
+   }
+
+   switch (name) {
+      case GL_VENDOR:
+         return (const GLubyte *) vendor;
+      case GL_RENDERER:
+         return (const GLubyte *) renderer;
+      case GL_VERSION:
+         return (const GLubyte *) ctx->VersionString;
+      case GL_EXTENSIONS:
+         return (const GLubyte *) ctx->Extensions.String;
+#if FEATURE_ARB_shading_language_100 || FEATURE_ES2
+      case GL_SHADING_LANGUAGE_VERSION:
+	 return shading_language_version(ctx);
+#endif
+#if FEATURE_NV_fragment_program || FEATURE_ARB_fragment_program || \
+    FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program
+      case GL_PROGRAM_ERROR_STRING_NV:
+         if (ctx->Extensions.NV_fragment_program ||
+             ctx->Extensions.ARB_fragment_program ||
+             ctx->Extensions.NV_vertex_program ||
+             ctx->Extensions.ARB_vertex_program) {
+            return (const GLubyte *) ctx->Program.ErrorString;
+         }
+         /* FALL-THROUGH */
+#endif
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetString" );
+         return (const GLubyte *) 0;
+   }
+}
+
+
+/**
+ * GL3
+ */
+const GLubyte * GLAPIENTRY
+_mesa_GetStringi(GLenum name, GLuint index)
+{
+   GET_CURRENT_CONTEXT(ctx);
+
+   if (!ctx)
+      return NULL;
+
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, NULL);
+
+   switch (name) {
+   case GL_EXTENSIONS:
+      if (index >= _mesa_get_extension_count(ctx)) {
+         _mesa_error(ctx, GL_INVALID_VALUE, "glGetStringi(index=%u)", index);
+         return (const GLubyte *) 0;
+      }
+      return _mesa_get_enabled_extension(ctx, index);
+   default:
+      _mesa_error( ctx, GL_INVALID_ENUM, "glGetString" );
+      return (const GLubyte *) 0;
+   }
+}
+
+
+
+/**
+ * Return pointer-valued state, such as a vertex array pointer.
+ *
+ * \param pname  names state to be queried
+ * \param params  returns the pointer value
+ *
+ * \sa glGetPointerv().
+ *
+ * Tries to get the specified pointer via dd_function_table::GetPointerv,
+ * otherwise gets the specified pointer from the current context.
+ */
+void GLAPIENTRY
+_mesa_GetPointerv( GLenum pname, GLvoid **params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   const GLuint clientUnit = ctx->Array.ActiveTexture;
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (!params)
+      return;
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glGetPointerv %s\n", _mesa_lookup_enum_by_nr(pname));
+
+   switch (pname) {
+      case GL_VERTEX_ARRAY_POINTER:
+         *params = (GLvoid *) ctx->Array.ArrayObj->Vertex.Ptr;
+         break;
+      case GL_NORMAL_ARRAY_POINTER:
+         *params = (GLvoid *) ctx->Array.ArrayObj->Normal.Ptr;
+         break;
+      case GL_COLOR_ARRAY_POINTER:
+         *params = (GLvoid *) ctx->Array.ArrayObj->Color.Ptr;
+         break;
+      case GL_SECONDARY_COLOR_ARRAY_POINTER_EXT:
+         *params = (GLvoid *) ctx->Array.ArrayObj->SecondaryColor.Ptr;
+         break;
+      case GL_FOG_COORDINATE_ARRAY_POINTER_EXT:
+         *params = (GLvoid *) ctx->Array.ArrayObj->FogCoord.Ptr;
+         break;
+      case GL_INDEX_ARRAY_POINTER:
+         *params = (GLvoid *) ctx->Array.ArrayObj->Index.Ptr;
+         break;
+      case GL_TEXTURE_COORD_ARRAY_POINTER:
+         *params = (GLvoid *) ctx->Array.ArrayObj->TexCoord[clientUnit].Ptr;
+         break;
+      case GL_EDGE_FLAG_ARRAY_POINTER:
+         *params = (GLvoid *) ctx->Array.ArrayObj->EdgeFlag.Ptr;
+         break;
+      case GL_FEEDBACK_BUFFER_POINTER:
+         *params = ctx->Feedback.Buffer;
+         break;
+      case GL_SELECTION_BUFFER_POINTER:
+         *params = ctx->Select.Buffer;
+         break;
+#if FEATURE_point_size_array
+      case GL_POINT_SIZE_ARRAY_POINTER_OES:
+         *params = (GLvoid *) ctx->Array.ArrayObj->PointSize.Ptr;
+         break;
+#endif
+      default:
+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetPointerv" );
+         return;
+   }
+}
+
+
+/**
+ * Returns the current GL error code, or GL_NO_ERROR.
+ * \return current error code
+ *
+ * Returns __struct gl_contextRec::ErrorValue.
+ */
+GLenum GLAPIENTRY
+_mesa_GetError( void )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLenum e = ctx->ErrorValue;
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glGetError <-- %s\n", _mesa_lookup_enum_by_nr(e));
+
+   ctx->ErrorValue = (GLenum) GL_NO_ERROR;
+   ctx->ErrorDebugCount = 0;
+   return e;
+}
+
+/**
+ * Returns an error code specified by GL_ARB_robustness, or GL_NO_ERROR.
+ * \return current context status
+ */
+GLenum GLAPIENTRY
+_mesa_GetGraphicsResetStatusARB( void )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLenum status = ctx->ResetStatus;
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glGetGraphicsResetStatusARB"
+                       "(always returns GL_NO_ERROR)\n");
+
+   return status;
+}