51 lines
1.8 KiB
Diff
51 lines
1.8 KiB
Diff
commit 88b702e8c47c8930940c396132b2a191d4a3e7ca
|
|
Author: Robert Ellison <papillo@i965-laptop.(none)>
|
|
Date: Fri Feb 13 15:19:04 2009 -0700
|
|
|
|
i965: Eric Anholt's patch for bumping up texture sizes
|
|
|
|
I'm committing this because it fixes a conform failure; the failure occurs
|
|
on the TextureProxy test, where the test attempts to create proxy textures
|
|
at every level, but fails at the last level (border == 1, width == 1,
|
|
height == 1) because it's beyond MAX_TEXTURE_LEVELS.
|
|
|
|
Eric's original comment was:
|
|
|
|
idr said that in his review swrast was ready for it, and the 965 driver is
|
|
advertising it already though it has been resulting in many crashes due to
|
|
arrays using these defines not being big enough.
|
|
|
|
diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
|
|
index c3feffd..9d0cd18 100644
|
|
--- a/src/mesa/main/config.h
|
|
+++ b/src/mesa/main/config.h
|
|
@@ -101,16 +101,16 @@
|
|
#define MAX_COLOR_TABLE_SIZE 256
|
|
|
|
/** Number of 1D/2D texture mipmap levels */
|
|
-#define MAX_TEXTURE_LEVELS 12
|
|
+#define MAX_TEXTURE_LEVELS 13
|
|
|
|
/** Number of 3D texture mipmap levels */
|
|
#define MAX_3D_TEXTURE_LEVELS 9
|
|
|
|
/** Number of cube texture mipmap levels - GL_ARB_texture_cube_map */
|
|
-#define MAX_CUBE_TEXTURE_LEVELS 12
|
|
+#define MAX_CUBE_TEXTURE_LEVELS 13
|
|
|
|
/** Maximum rectangular texture size - GL_NV_texture_rectangle */
|
|
-#define MAX_TEXTURE_RECT_SIZE 2048
|
|
+#define MAX_TEXTURE_RECT_SIZE 4096
|
|
|
|
/** Maximum number of layers in a 1D or 2D array texture - GL_MESA_texture_array */
|
|
#define MAX_ARRAY_TEXTURE_LAYERS 64
|
|
@@ -166,7 +166,7 @@
|
|
#define MAX_TEXTURE_MAX_ANISOTROPY 16.0
|
|
|
|
/** For GL_EXT_texture_lod_bias (typically MAX_TEXTURE_LEVELS - 1) */
|
|
-#define MAX_TEXTURE_LOD_BIAS 11.0
|
|
+#define MAX_TEXTURE_LOD_BIAS 12.0
|
|
|
|
/** For GL_ARB_vertex_program */
|
|
/*@{*/
|