projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
radeon/r600: Fix remaining warnings when building 64 bit binary.
[mesa.git]
/
src
/
mesa
/
shader
/
nvprogram.c
diff --git
a/src/mesa/shader/nvprogram.c
b/src/mesa/shader/nvprogram.c
index 8ba521182b8389ad3354366cde234605274fce96..d6469b17bea7074228a4061219acbd4c26b527eb 100644
(file)
--- a/
src/mesa/shader/nvprogram.c
+++ b/
src/mesa/shader/nvprogram.c
@@
-354,6
+354,7
@@
_mesa_GetTrackMatrixivNV(GLenum target, GLuint address,
void GLAPIENTRY
_mesa_GetVertexAttribdvNV(GLuint index, GLenum pname, GLdouble *params)
{
void GLAPIENTRY
_mesa_GetVertexAttribdvNV(GLuint index, GLenum pname, GLdouble *params)
{
+ const struct gl_client_array *array;
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
@@
-362,15
+363,17
@@
_mesa_GetVertexAttribdvNV(GLuint index, GLenum pname, GLdouble *params)
return;
}
return;
}
+ array = &ctx->Array.ArrayObj->VertexAttrib[index];
+
switch (pname) {
case GL_ATTRIB_ARRAY_SIZE_NV:
switch (pname) {
case GL_ATTRIB_ARRAY_SIZE_NV:
- params[0] =
ctx->Array.ArrayObj->VertexAttrib[index].
Size;
+ params[0] =
array->
Size;
break;
case GL_ATTRIB_ARRAY_STRIDE_NV:
break;
case GL_ATTRIB_ARRAY_STRIDE_NV:
- params[0] =
ctx->Array.ArrayObj->VertexAttrib[index].
Stride;
+ params[0] =
array->
Stride;
break;
case GL_ATTRIB_ARRAY_TYPE_NV:
break;
case GL_ATTRIB_ARRAY_TYPE_NV:
- params[0] =
ctx->Array.ArrayObj->VertexAttrib[index].
Type;
+ params[0] =
array->
Type;
break;
case GL_CURRENT_ATTRIB_NV:
if (index == 0) {
break;
case GL_CURRENT_ATTRIB_NV:
if (index == 0) {
@@
-395,6
+398,7
@@
_mesa_GetVertexAttribdvNV(GLuint index, GLenum pname, GLdouble *params)
void GLAPIENTRY
_mesa_GetVertexAttribfvNV(GLuint index, GLenum pname, GLfloat *params)
{
void GLAPIENTRY
_mesa_GetVertexAttribfvNV(GLuint index, GLenum pname, GLfloat *params)
{
+ const struct gl_client_array *array;
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
@@
-403,15
+407,17
@@
_mesa_GetVertexAttribfvNV(GLuint index, GLenum pname, GLfloat *params)
return;
}
return;
}
+ array = &ctx->Array.ArrayObj->VertexAttrib[index];
+
switch (pname) {
case GL_ATTRIB_ARRAY_SIZE_NV:
switch (pname) {
case GL_ATTRIB_ARRAY_SIZE_NV:
- params[0] = (GLfloat)
ctx->Array.ArrayObj->VertexAttrib[index].
Size;
+ params[0] = (GLfloat)
array->
Size;
break;
case GL_ATTRIB_ARRAY_STRIDE_NV:
break;
case GL_ATTRIB_ARRAY_STRIDE_NV:
- params[0] = (GLfloat)
ctx->Array.ArrayObj->VertexAttrib[index].
Stride;
+ params[0] = (GLfloat)
array->
Stride;
break;
case GL_ATTRIB_ARRAY_TYPE_NV:
break;
case GL_ATTRIB_ARRAY_TYPE_NV:
- params[0] = (GLfloat)
ctx->Array.ArrayObj->VertexAttrib[index].
Type;
+ params[0] = (GLfloat)
array->
Type;
break;
case GL_CURRENT_ATTRIB_NV:
if (index == 0) {
break;
case GL_CURRENT_ATTRIB_NV:
if (index == 0) {
@@
-436,6
+442,7
@@
_mesa_GetVertexAttribfvNV(GLuint index, GLenum pname, GLfloat *params)
void GLAPIENTRY
_mesa_GetVertexAttribivNV(GLuint index, GLenum pname, GLint *params)
{
void GLAPIENTRY
_mesa_GetVertexAttribivNV(GLuint index, GLenum pname, GLint *params)
{
+ const struct gl_client_array *array;
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
@@
-444,15
+451,17
@@
_mesa_GetVertexAttribivNV(GLuint index, GLenum pname, GLint *params)
return;
}
return;
}
+ array = &ctx->Array.ArrayObj->VertexAttrib[index];
+
switch (pname) {
case GL_ATTRIB_ARRAY_SIZE_NV:
switch (pname) {
case GL_ATTRIB_ARRAY_SIZE_NV:
- params[0] =
ctx->Array.ArrayObj->VertexAttrib[index].
Size;
+ params[0] =
array->
Size;
break;
case GL_ATTRIB_ARRAY_STRIDE_NV:
break;
case GL_ATTRIB_ARRAY_STRIDE_NV:
- params[0] =
ctx->Array.ArrayObj->VertexAttrib[index].
Stride;
+ params[0] =
array->
Stride;
break;
case GL_ATTRIB_ARRAY_TYPE_NV:
break;
case GL_ATTRIB_ARRAY_TYPE_NV:
- params[0] =
ctx->Array.ArrayObj->VertexAttrib[index].
Type;
+ params[0] =
array->
Type;
break;
case GL_CURRENT_ATTRIB_NV:
if (index == 0) {
break;
case GL_CURRENT_ATTRIB_NV:
if (index == 0) {
@@
-467,7
+476,7
@@
_mesa_GetVertexAttribivNV(GLuint index, GLenum pname, GLint *params)
params[3] = (GLint) ctx->Current.Attrib[index][3];
break;
case GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB:
params[3] = (GLint) ctx->Current.Attrib[index][3];
break;
case GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB:
- params[0] =
ctx->Array.ArrayObj->VertexAttrib[index].
BufferObj->Name;
+ params[0] =
array->
BufferObj->Name;
break;
default:
_mesa_error(ctx, GL_INVALID_ENUM, "glGetVertexAttribdvNV");
break;
default:
_mesa_error(ctx, GL_INVALID_ENUM, "glGetVertexAttribdvNV");