aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/context.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-10-17 08:04:15 +0200
committermarha <marha@users.sourceforge.net>2012-10-17 08:04:15 +0200
commitded57b5a4131a213d57f5a20d50b819b7a8924df (patch)
tree5be4cc93cf5d77df72f8ae6e34953e026bde071f /mesalib/src/mesa/main/context.c
parent54db46582aba2252d544fa3956522f9ef06b49cb (diff)
downloadvcxsrv-ded57b5a4131a213d57f5a20d50b819b7a8924df.tar.gz
vcxsrv-ded57b5a4131a213d57f5a20d50b819b7a8924df.tar.bz2
vcxsrv-ded57b5a4131a213d57f5a20d50b819b7a8924df.zip
pixman mesa git update 17 oct 2012
pixman: 6e56098c0338ce74228187e4c96fed1a66cb0956 mesa: 0199ff7fe323cf527ffacfdef3258ab85799dd13
Diffstat (limited to 'mesalib/src/mesa/main/context.c')
-rw-r--r--mesalib/src/mesa/main/context.c19
1 files changed, 3 insertions, 16 deletions
diff --git a/mesalib/src/mesa/main/context.c b/mesalib/src/mesa/main/context.c
index 29f28bd18..b00c64233 100644
--- a/mesalib/src/mesa/main/context.c
+++ b/mesalib/src/mesa/main/context.c
@@ -129,9 +129,7 @@
#include "vtxfmt.h"
#include "program/program.h"
#include "program/prog_print.h"
-#if _HAVE_FULL_GL
#include "math/m_matrix.h"
-#endif
#include "main/dispatch.h" /* for _gloffset_COUNT */
#ifdef USE_SPARC_ASM
@@ -490,7 +488,7 @@ init_program_limits(struct gl_context *ctx, GLenum type,
switch (type) {
case GL_VERTEX_PROGRAM_ARB:
prog->MaxParameters = MAX_VERTEX_PROGRAM_PARAMS;
- prog->MaxAttribs = MAX_NV_VERTEX_PROGRAM_INPUTS;
+ prog->MaxAttribs = MAX_VERTEX_GENERIC_ATTRIBS;
prog->MaxAddressRegs = MAX_VERTEX_PROGRAM_ADDRESS_REGS;
prog->MaxUniformComponents = 4 * MAX_UNIFORMS;
break;
@@ -501,8 +499,8 @@ init_program_limits(struct gl_context *ctx, GLenum type,
prog->MaxUniformComponents = 4 * MAX_UNIFORMS;
break;
case MESA_GEOMETRY_PROGRAM:
- prog->MaxParameters = MAX_NV_VERTEX_PROGRAM_PARAMS;
- prog->MaxAttribs = MAX_NV_VERTEX_PROGRAM_INPUTS;
+ prog->MaxParameters = MAX_VERTEX_PROGRAM_PARAMS;
+ prog->MaxAttribs = MAX_VERTEX_GENERIC_ATTRIBS;
prog->MaxAddressRegs = MAX_VERTEX_PROGRAM_ADDRESS_REGS;
prog->MaxUniformComponents = MAX_GEOMETRY_UNIFORM_COMPONENTS;
break;
@@ -687,11 +685,6 @@ check_context_limits(struct gl_context *ctx)
assert(ctx->Const.FragmentProgram.MaxLocalParams <= MAX_PROGRAM_LOCAL_PARAMS);
assert(ctx->Const.VertexProgram.MaxLocalParams <= MAX_PROGRAM_LOCAL_PARAMS);
- assert(MAX_NV_FRAGMENT_PROGRAM_TEMPS <= MAX_PROGRAM_TEMPS);
- assert(MAX_NV_VERTEX_PROGRAM_TEMPS <= MAX_PROGRAM_TEMPS);
- assert(MAX_NV_VERTEX_PROGRAM_INPUTS <= VERT_ATTRIB_MAX);
- assert(MAX_NV_VERTEX_PROGRAM_OUTPUTS <= VERT_RESULT_MAX);
-
/* Texture unit checks */
assert(ctx->Const.MaxTextureImageUnits > 0);
assert(ctx->Const.MaxTextureImageUnits <= MAX_TEXTURE_IMAGE_UNITS);
@@ -1165,7 +1158,6 @@ _mesa_destroy_context( struct gl_context *ctx )
}
-#if _HAVE_FULL_GL
/**
* Copy attribute groups from one context to another.
*
@@ -1286,7 +1278,6 @@ _mesa_copy_context( const struct gl_context *src, struct gl_context *dst,
dst->NewState = _NEW_ALL;
dst->NewDriverState = ~0;
}
-#endif
/**
@@ -1463,8 +1454,6 @@ _mesa_make_current( struct gl_context *newCtx,
#if 1
/* We want to get rid of these lines: */
-
-#if _HAVE_FULL_GL
if (!drawBuffer->Initialized) {
initialize_framebuffer_size(newCtx, drawBuffer);
}
@@ -1473,8 +1462,6 @@ _mesa_make_current( struct gl_context *newCtx,
}
_mesa_resizebuffers(newCtx);
-#endif
-
#else
/* We want the drawBuffer and readBuffer to be initialized by
* the driver.