mesa: remove last of MAX_WIDTH, MAX_HEIGHT

Define new MAX_VIEWPORT_WIDTH/HEIGHT and MAX_RENDERBUFFER_SIZE values
instead.

diff --git a/src/mesa/drivers/dri/i915/intel_decode.c b/src/mesa/drivers/dri/i915/intel_decode.c
deleted file mode 120000 (symlink)
index f671b6c..0000000
--- a/src/mesa/drivers/dri/i915/intel_decode.c
+++ /dev/null
@@ -1 +0,0 @@
-../intel/intel_decode.c
\ No newline at end of file

diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index 6286fe011d3813d6dd06523b099f32ad89e86f98..c70cc1818a505b200b36c5c68b59837bddf60ae0 100644 (file)
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -136,15 +136,9 @@
 #define MAX_TEXTURE_UNITS ((MAX_TEXTURE_COORD_UNITS > MAX_TEXTURE_IMAGE_UNITS) ? MAX_TEXTURE_COORD_UNITS : MAX_TEXTURE_IMAGE_UNITS)
 
 
-/** 
- * Maximum viewport/image size.  Must accomodate all texture sizes too. 
- */
-#ifndef MAX_WIDTH
-#   define MAX_WIDTH 16384
-#endif
-#ifndef MAX_HEIGHT
-#   define MAX_HEIGHT 16384
-#endif
+/** Maximum viewport size */
+#define MAX_VIEWPORT_WIDTH 16384
+#define MAX_VIEWPORT_HEIGHT 16384
 
 /** Maxmimum size for CVA.  May be overridden by the drivers.  */
 #define MAX_ARRAY_LOCK_SIZE 3000
@@ -248,6 +242,7 @@
 /** For GL_EXT_framebuffer_object */
 /*@{*/
 #define MAX_COLOR_ATTACHMENTS 8
+#define MAX_RENDERBUFFER_SIZE 16384
 /*@}*/
 
 /** For GL_ATI_envmap_bump - support bump mapping on first 8 units */

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index adee2faa1bbf0b661586a43f0aeaa15518e9fb76..555489343e3c0d9ea9cd7620a545c6169325aed1 100644 (file)
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -586,8 +586,8 @@ _mesa_init_constants(struct gl_context *ctx)
    ctx->Const.MaxLights = MAX_LIGHTS;
    ctx->Const.MaxShininess = 128.0;
    ctx->Const.MaxSpotExponent = 128.0;
-   ctx->Const.MaxViewportWidth = MAX_WIDTH;
-   ctx->Const.MaxViewportHeight = MAX_HEIGHT;
+   ctx->Const.MaxViewportWidth = MAX_VIEWPORT_WIDTH;
+   ctx->Const.MaxViewportHeight = MAX_VIEWPORT_HEIGHT;
 #if FEATURE_ARB_vertex_program
    init_program_limits(GL_VERTEX_PROGRAM_ARB, &ctx->Const.VertexProgram);
 #endif
@@ -608,7 +608,7 @@ _mesa_init_constants(struct gl_context *ctx)
 
 #if FEATURE_EXT_framebuffer_object
    ctx->Const.MaxColorAttachments = MAX_COLOR_ATTACHMENTS;
-   ctx->Const.MaxRenderbufferSize = MAX_WIDTH;
+   ctx->Const.MaxRenderbufferSize = MAX_RENDERBUFFER_SIZE;
 #endif
 
 #if FEATURE_ARB_vertex_shader