mesa: Changes to 'upstream-experimental'
configs/current.in | 23
configs/default | 18
configure.ac | 91 -
scons/custom.py | 25
src/gallium/auxiliary/cso_cache/cso_context.c | 2
src/gallium/auxiliary/draw/draw_context.c | 49
src/gallium/auxiliary/draw/draw_context.h | 3
src/gallium/auxiliary/draw/draw_gs.c | 22
src/gallium/auxiliary/draw/draw_llvm.c | 20
src/gallium/auxiliary/draw/draw_llvm.h | 4
src/gallium/auxiliary/draw/draw_llvm_sample.c | 6
src/gallium/auxiliary/draw/draw_private.h | 34
src/gallium/auxiliary/draw/draw_vs.c | 6
src/gallium/auxiliary/draw/draw_vs_exec.c | 6
src/gallium/auxiliary/util/u_upload_mgr.h | 7
src/gallium/drivers/galahad/glhd_context.c | 98 -
src/gallium/drivers/i915/i915_context.h | 6
src/gallium/drivers/i915/i915_screen.c | 2
src/gallium/drivers/i915/i915_state.c | 15
src/gallium/drivers/identity/id_context.c | 94 -
src/gallium/drivers/llvmpipe/lp_context.c | 4
src/gallium/drivers/llvmpipe/lp_context.h | 2
src/gallium/drivers/llvmpipe/lp_screen.c | 4
src/gallium/drivers/llvmpipe/lp_state_sampler.c | 92 -
src/gallium/drivers/nv50/codegen/nv50_ir_emit_nv50.cpp | 2
src/gallium/drivers/nv50/codegen/nv50_ir_from_tgsi.cpp | 2
src/gallium/drivers/r600/compute_memory_pool.c | 6
src/gallium/drivers/r600/evergreen_compute.c | 23
src/gallium/drivers/r600/evergreen_compute_internal.c | 14
src/gallium/drivers/r600/evergreen_state.c | 381 ++--
src/gallium/drivers/r600/r600_blit.c | 109 -
src/gallium/drivers/r600/r600_pipe.h | 16
src/gallium/drivers/r600/r600_resource.h | 14
src/gallium/drivers/r600/r600_shader.c | 2
src/gallium/drivers/r600/r600_state.c | 15
src/gallium/drivers/r600/r600_state_common.c | 58
src/gallium/drivers/r600/r600_texture.c | 70
src/gallium/drivers/radeon/R600ISelLowering.cpp | 86 -
src/gallium/drivers/radeon/R600ISelLowering.h | 7
src/gallium/drivers/radeon/R600Instructions.td | 18
src/gallium/drivers/radeon/radeon_llvm_emit.cpp | 15
src/gallium/drivers/radeonsi/r600.h | 10
src/gallium/drivers/radeonsi/r600_blit.c | 10
src/gallium/drivers/radeonsi/r600_buffer.c | 8
src/gallium/drivers/radeonsi/r600_hw_context.c | 21
src/gallium/drivers/radeonsi/r600_resource.c | 6
src/gallium/drivers/radeonsi/r600_resource.h | 20
src/gallium/drivers/radeonsi/r600_texture.c | 414 ++---
src/gallium/drivers/radeonsi/radeonsi_pipe.c | 10
src/gallium/drivers/radeonsi/radeonsi_pipe.h | 22
src/gallium/drivers/radeonsi/radeonsi_shader.c | 1
src/gallium/drivers/radeonsi/si_state.c | 23
src/gallium/drivers/radeonsi/si_state_draw.c | 4
src/gallium/drivers/rbug/rbug_context.c | 113 -
src/gallium/drivers/rbug/rbug_context.h | 17
src/gallium/drivers/rbug/rbug_core.c | 17
src/gallium/drivers/softpipe/sp_context.c | 8
src/gallium/drivers/softpipe/sp_context.h | 2
src/gallium/drivers/softpipe/sp_screen.c | 4
src/gallium/drivers/softpipe/sp_state_derived.c | 2
src/gallium/drivers/softpipe/sp_state_sampler.c | 88 -
src/gallium/drivers/svga/svga_cmd.c | 5
src/gallium/drivers/svga/svga_pipe_sampler.c | 89 -
src/gallium/drivers/svga/svga_state.c | 4
src/gallium/drivers/svga/svga_state.h | 4
src/gallium/drivers/svga/svga_state_constants.c | 58
src/gallium/drivers/trace/tr_context.c | 142 +
src/gallium/include/pipe/p_state.h | 2
src/gallium/state_trackers/egl/wayland/native_drm.c | 5
src/gallium/targets/Makefile.va | 2
src/gallium/targets/Makefile.vdpau | 2
src/gallium/targets/Makefile.xvmc | 2
src/gallium/winsys/radeon/drm/radeon_drm_bo.c | 92 -
src/mesa/SConscript | 2
src/mesa/drivers/common/meta.c | 2
src/mesa/drivers/dri/i965/brw_vs_constval.c | 4
src/mesa/drivers/osmesa/Makefile.am | 2
src/mesa/main/APIspec.xml | 381 ----
src/mesa/main/es1_conversion.c | 1368 +++++++++++++++++
src/mesa/main/es1_conversion.h | 157 +
src/mesa/main/es_generator.py | 7
src/mesa/main/fbobject.c | 2
src/mesa/main/pack.c | 2
src/mesa/main/texgetimage.c | 45
src/mesa/main/teximage.c | 4
src/mesa/main/texparam.c | 240 ++
src/mesa/sources.mak | 3
src/mesa/state_tracker/st_atom.c | 3
src/mesa/state_tracker/st_atom.h | 3
src/mesa/state_tracker/st_atom_sampler.c | 26
src/mesa/state_tracker/st_atom_texture.c | 47
src/mesa/state_tracker/st_cb_bitmap.c | 11
src/mesa/state_tracker/st_context.c | 20
src/mesa/state_tracker/st_context.h | 13
src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 6
95 files changed, 3364 insertions(+), 1662 deletions(-)
New commits:
commit c1114c619acf347917565cd1d0467240a89a76c0
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Thu Jul 26 10:38:15 2012 -0700
APIspec: Remove cruft about AMD_compressed_???_texture
Mesa doesn't support these extensions, and it seems unlikely that it
ever will
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
diff --git a/src/mesa/main/APIspec.xml b/src/mesa/main/APIspec.xml
index a0c9c96..c26caf6 100644
--- a/src/mesa/main/APIspec.xml
+++ b/src/mesa/main/APIspec.xml
@@ -2085,14 +2085,6 @@
<desc name="target">
<value name="GL_TEXTURE_3D_OES"/>
</desc>
-
- <desc name="internalFormat">
- <value name="GL_3DC_X_AMD" category="AMD_compressed_3DC_texture"/>
- <value name="GL_3DC_XY_AMD" category="AMD_compressed_3DC_texture"/>
- <value name="GL_ATC_RGB_AMD" category="AMD_compressed_ATC_texture"/>
- <value name="GL_ATC_RGBA_EXPLICIT_ALPHA_AMD" category="AMD_compressed_ATC_texture"/>
- <value name="GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD" category="AMD_compressed_ATC_texture"/>
- </desc>
</template>
<template name="CompressedTexSubImage3D">
@@ -2181,13 +2173,6 @@
<value name="GL_PALETTE8_RGBA4_OES" category="OES_compressed_paletted_texture"/>
<value name="GL_PALETTE8_RGB5_A1_OES" category="OES_compressed_paletted_texture"/>
- <value name="GL_3DC_X_AMD" category="AMD_compressed_3DC_texture"/>
- <value name="GL_3DC_XY_AMD" category="AMD_compressed_3DC_texture"/>
-
- <value name="GL_ATC_RGB_AMD" category="AMD_compressed_ATC_texture"/>
- <value name="GL_ATC_RGBA_EXPLICIT_ALPHA_AMD" category="AMD_compressed_ATC_texture"/>
- <value name="GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD" category="AMD_compressed_ATC_texture"/>
-
<value name="GL_COMPRESSED_RGB_S3TC_DXT1_EXT" category="EXT_texture_compression_dxt1"/>
<value name="GL_COMPRESSED_RGBA_S3TC_DXT1_EXT" category="EXT_texture_compression_dxt1"/>
</desc>
commit 4c32ee5bcaa0815f4f975066de98c6598bdaf51d
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Fri Jul 27 07:23:14 2012 -0700
mesa/es: Remove redundant glFramebufferTexture3D textarget validation
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
diff --git a/src/mesa/main/APIspec.xml b/src/mesa/main/APIspec.xml
index 0bba3cb..a0c9c96 100644
--- a/src/mesa/main/APIspec.xml
+++ b/src/mesa/main/APIspec.xml
@@ -2927,10 +2927,6 @@
<param name="level" type="GLint"/>
<param name="zoffset" type="GLint"/>
</proto>
-
- <desc name="textarget" error="GL_INVALID_OPERATION">
- <value name="GL_TEXTURE_3D_OES" category="OES_texture_3D"/>
- </desc>
</template>
<template name="CheckFramebufferStatus" direction="get">
commit 7c9afe50fd674c3503d880b1f0f5216577bf7d9d
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Fri Jul 27 07:18:48 2012 -0700
mesa/es: Remove redundant glGetShaderiv pname validation
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
diff --git a/src/mesa/main/APIspec.xml b/src/mesa/main/APIspec.xml
index 3542415..0bba3cb 100644
--- a/src/mesa/main/APIspec.xml
+++ b/src/mesa/main/APIspec.xml
@@ -3030,14 +3030,6 @@
<param name="pname" type="GLenum"/>
<vector name="params" type="GLtype *" size="dynamic"/>
</proto>
-
- <desc name="pname">
- <value name="GL_SHADER_TYPE"/>
- <value name="GL_COMPILE_STATUS"/>
- <value name="GL_DELETE_STATUS"/>
- <value name="GL_INFO_LOG_LENGTH"/>
- <value name="GL_SHADER_SOURCE_LENGTH"/>
- </desc>
</template>
<template name="GetAttachedShaders" direction="get">
commit aaef4416385883a1bb23785164c0ca3973b3267e
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Fri Jul 27 07:06:58 2012 -0700
mesa/es: Remove redundant glCompressedTexImage border validation
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
diff --git a/src/mesa/main/APIspec.xml b/src/mesa/main/APIspec.xml
index aa60855..3542415 100644
--- a/src/mesa/main/APIspec.xml
+++ b/src/mesa/main/APIspec.xml
@@ -2191,10 +2191,6 @@
<value name="GL_COMPRESSED_RGB_S3TC_DXT1_EXT" category="EXT_texture_compression_dxt1"/>
<value name="GL_COMPRESSED_RGBA_S3TC_DXT1_EXT" category="EXT_texture_compression_dxt1"/>
</desc>
-
- <desc name="border" error="GL_INVALID_VALUE">
- <value name="0"/>
- </desc>
</template>
<template name="CompressedTexSubImage2D">
commit d39cb8e9ef23b7fadde945f27e956f762301a0ec
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed Jul 25 15:24:38 2012 -0700
mesa/es: Remove redundant glPointSizePointer type validation
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
diff --git a/src/mesa/main/APIspec.xml b/src/mesa/main/APIspec.xml
index 1c1a1c8..aa60855 100644
--- a/src/mesa/main/APIspec.xml
+++ b/src/mesa/main/APIspec.xml
@@ -198,11 +198,6 @@
<param name="stride" type="GLsizei"/>
<param name="pointer" type="const GLvoid *"/>
</proto>
-
- <desc name="type">
- <value name="GL_FLOAT"/>
- <value name="GL_FIXED"/>
- </desc>
</template>
<template name="Scissor">
commit d54004c3526e2040be6521546b263f29c77f06ce
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed Jul 25 16:15:25 2012 -0700
mesa/es: Remove redundant glGetBufferPointer pname validation
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
diff --git a/src/mesa/main/APIspec.xml b/src/mesa/main/APIspec.xml
index 69e5233..1c1a1c8 100644
--- a/src/mesa/main/APIspec.xml
+++ b/src/mesa/main/APIspec.xml
@@ -2490,10 +2490,6 @@
<value name="GL_ARRAY_BUFFER"/>
<value name="GL_ELEMENT_ARRAY_BUFFER"/>
</desc>
-
- <desc name="pname">
- <value name="GL_BUFFER_MAP_POINTER_OES"/>
- </desc>
</template>
<template name="MapBuffer" direction="get">
commit 68d7ce3e9e54bfa544a1438b73d0920bf89a2de7
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed Jul 25 15:20:32 2012 -0700
mesa/es: Remove redundant glGetVertexAttribPointer pname validation
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
diff --git a/src/mesa/main/APIspec.xml b/src/mesa/main/APIspec.xml
index 2a002e9..69e5233 100644
--- a/src/mesa/main/APIspec.xml
+++ b/src/mesa/main/APIspec.xml
@@ -2476,10 +2476,6 @@
<param name="pname" type="GLenum"/>
<vector name="pointer" type="GLvoid **" size="dynamic"/>
</proto>
-
- <desc name="pname">
- <value name="GL_VERTEX_ATTRIB_ARRAY_POINTER"/>
- </desc>
</template>
<template name="GetBufferPointer" direction="get">
commit 5be5cf69341c4acf0ae666373790db9ad1df06fd
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed Jul 25 07:26:33 2012 -0700
mesa/es: Remove redundant element type validation
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
diff --git a/src/mesa/main/APIspec.xml b/src/mesa/main/APIspec.xml
index 565e766..2a002e9 100644
--- a/src/mesa/main/APIspec.xml
+++ b/src/mesa/main/APIspec.xml
@@ -1517,12 +1517,6 @@
<value name="GL_TRIANGLE_STRIP"/>
<value name="GL_TRIANGLE_FAN"/>
</desc>
-
- <desc name="type">
- <value name="GL_UNSIGNED_BYTE"/>
- <value name="GL_UNSIGNED_SHORT"/>
- <value name="GL_UNSIGNED_INT" category="OES_element_index_uint"/>
- </desc>
</template>
<template name="EnableClientState">
@@ -3182,12 +3176,6 @@
<value name="GL_TRIANGLE_STRIP"/>
<value name="GL_TRIANGLE_FAN"/>
</desc>
-
- <desc name="type">
- <value name="GL_UNSIGNED_BYTE"/>
- <value name="GL_UNSIGNED_SHORT"/>
- <value name="GL_UNSIGNED_INT" category="OES_element_index_uint"/>
- </desc>
</template>
<template name="EGLImageTargetTexture2D">
commit b99a8caff14d66a963a68d5599da2b50a9938765
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue Jul 24 20:18:17 2012 -0700
mesa/es: Remove redundant glGetShaderPrecisionFormat shader type validation
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
diff --git a/src/mesa/main/APIspec.xml b/src/mesa/main/APIspec.xml
index 889efe2..565e766 100644
--- a/src/mesa/main/APIspec.xml
+++ b/src/mesa/main/APIspec.xml
@@ -3111,20 +3111,6 @@
<param name="range" type="GLint *"/>
<param name="precision" type="GLint *"/>
</proto>
-
- <desc name="shadertype">
- <value name="GL_VERTEX_SHADER"/>
- <value name="GL_FRAGMENT_SHADER"/>
- </desc>
-
- <desc name="precisiontype">
- <value name="GL_LOW_FLOAT"/>
- <value name="GL_MEDIUM_FLOAT"/>
- <value name="GL_HIGH_FLOAT"/>
- <value name="GL_LOW_INT"/>
- <value name="GL_MEDIUM_INT"/>
- <value name="GL_HIGH_INT"/>
- </desc>
</template>
<template name="GetUniform" direction="get">
commit c914ac239e74282458f69956a4358545b41f9c3f
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue Sep 20 16:50:50 2011 -0700
mesa/es: Remove redundant depth func validation
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
diff --git a/src/mesa/main/APIspec.xml b/src/mesa/main/APIspec.xml
index 41cff06..889efe2 100644
--- a/src/mesa/main/APIspec.xml
+++ b/src/mesa/main/APIspec.xml
@@ -939,17 +939,6 @@
<return type="void"/>
<param name="func" type="GLenum"/>
</proto>
-
- <desc name="func">
- <value name="GL_NEVER"/>
- <value name="GL_LESS"/>
- <value name="GL_EQUAL"/>
- <value name="GL_LEQUAL"/>
- <value name="GL_GREATER"/>
- <value name="GL_NOTEQUAL"/>
- <value name="GL_GEQUAL"/>
- <value name="GL_ALWAYS"/>
- </desc>
</template>
<template name="PixelStore">
commit af276d9d4bbdafe0845956480edeacfe820bcd84
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue Sep 20 16:50:22 2011 -0700
mesa/es: Remove redundant stencil op fail/zfail/zpass validation
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
diff --git a/src/mesa/main/APIspec.xml b/src/mesa/main/APIspec.xml
index a5dd350..41cff06 100644
--- a/src/mesa/main/APIspec.xml
+++ b/src/mesa/main/APIspec.xml
@@ -922,45 +922,6 @@
<param name="zfail" type="GLenum"/>
<param name="zpass" type="GLenum"/>
</proto>
-
- <desc name="fail">
- <value name="GL_KEEP"/>
- <value name="GL_ZERO"/>
- <value name="GL_REPLACE"/>
- <value name="GL_INCR"/>
- <value name="GL_DECR"/>
- <value name="GL_INVERT"/>
- <value name="GL_INCR_WRAP" category="GLES2.0"/>
- <value name="GL_DECR_WRAP" category="GLES2.0"/>
- <value name="GL_INCR_WRAP_OES" category="OES_stencil_wrap"/>
- <value name="GL_DECR_WRAP_OES" category="OES_stencil_wrap"/>
- </desc>
-
- <desc name="zfail">
- <value name="GL_KEEP"/>
- <value name="GL_ZERO"/>
- <value name="GL_REPLACE"/>
- <value name="GL_INCR"/>
- <value name="GL_DECR"/>
- <value name="GL_INVERT"/>
- <value name="GL_INCR_WRAP" category="GLES2.0"/>
- <value name="GL_DECR_WRAP" category="GLES2.0"/>
- <value name="GL_INCR_WRAP_OES" category="OES_stencil_wrap"/>
- <value name="GL_DECR_WRAP_OES" category="OES_stencil_wrap"/>
- </desc>
-
- <desc name="zpass">
- <value name="GL_KEEP"/>
- <value name="GL_ZERO"/>
- <value name="GL_REPLACE"/>
- <value name="GL_INCR"/>
- <value name="GL_DECR"/>
- <value name="GL_INVERT"/>
- <value name="GL_INCR_WRAP" category="GLES2.0"/>
- <value name="GL_DECR_WRAP" category="GLES2.0"/>
- <value name="GL_INCR_WRAP_OES" category="OES_stencil_wrap"/>
- <value name="GL_DECR_WRAP_OES" category="OES_stencil_wrap"/>
- </desc>
</template>
<template name="StencilOpSeparate">
@@ -971,39 +932,6 @@
<param name="zfail" type="GLenum"/>
<param name="zpass" type="GLenum"/>
</proto>
-
- <desc name="fail">
- <value name="GL_KEEP"/>
- <value name="GL_ZERO"/>
- <value name="GL_REPLACE"/>
- <value name="GL_INCR"/>
- <value name="GL_DECR"/>
- <value name="GL_INVERT"/>
- <value name="GL_INCR_WRAP"/>
- <value name="GL_DECR_WRAP"/>
- </desc>
-
- <desc name="zfail">
- <value name="GL_KEEP"/>
- <value name="GL_ZERO"/>
- <value name="GL_REPLACE"/>
- <value name="GL_INCR"/>
- <value name="GL_DECR"/>
- <value name="GL_INVERT"/>
- <value name="GL_INCR_WRAP"/>
- <value name="GL_DECR_WRAP"/>
- </desc>
-
- <desc name="zpass">
- <value name="GL_KEEP"/>
- <value name="GL_ZERO"/>
- <value name="GL_REPLACE"/>
- <value name="GL_INCR"/>
- <value name="GL_DECR"/>
- <value name="GL_INVERT"/>
- <value name="GL_INCR_WRAP"/>
- <value name="GL_DECR_WRAP"/>
- </desc>
</template>
<template name="DepthFunc">
commit f3f993153c5310c35e79bb6184d32e2271793b0f
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue Sep 20 16:47:43 2011 -0700
mesa/es: Remove redundant shade model mode validation
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
diff --git a/src/mesa/main/APIspec.xml b/src/mesa/main/APIspec.xml
index a64b57a..a5dd350 100644
--- a/src/mesa/main/APIspec.xml
+++ b/src/mesa/main/APIspec.xml
@@ -220,11 +220,6 @@
<return type="void"/>
<param name="mode" type="GLenum"/>
</proto>
-
- <desc name="mode">
- <value name="GL_FLAT"/>
- <value name="GL_SMOOTH"/>
- </desc>
</template>
<template name="TexParameter">
commit 5a193557d115e62bf70c599e4037d8e1e3f5a9fc
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue Sep 20 16:45:43 2011 -0700
mesa/es: Remove redundant light pname and light validation
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
diff --git a/src/mesa/main/APIspec.xml b/src/mesa/main/APIspec.xml
index d0aaaa3..a64b57a 100644
--- a/src/mesa/main/APIspec.xml
+++ b/src/mesa/main/APIspec.xml
@@ -120,35 +120,6 @@
<param name="param" type="GLtype"/>
</vector>
</proto>
-
- <desc name="light">
- <range base="GL_LIGHT" from="0" to="7"/>
- </desc>
-
- <desc name="pname">
- <value name="GL_AMBIENT"/>
- <value name="GL_DIFFUSE"/>
- <value name="GL_SPECULAR"/>
- <value name="GL_POSITION"/>
-
- <desc name="params" vector_size="4"/>
- </desc>
-
- <desc name="pname">
- <value name="GL_SPOT_DIRECTION"/>
-
- <desc name="params" vector_size="3"/>
- </desc>
-
- <desc name="pname">
- <value name="GL_SPOT_EXPONENT"/>
- <value name="GL_SPOT_CUTOFF"/>
- <value name="GL_CONSTANT_ATTENUATION"/>
- <value name="GL_LINEAR_ATTENUATION"/>
- <value name="GL_QUADRATIC_ATTENUATION"/>
-
- <desc name="params" vector_size="1"/>
- </desc>
</template>
<template name="LightModel">
@@ -1190,35 +1161,6 @@
<param name="pname" type="GLenum"/>
<vector name="params" type="GLtype *" size="dynamic"/>
</proto>
-
- <desc name="light">
- <range base="GL_LIGHT" from="0" to="7"/>
- </desc>
-
- <desc name="pname">
- <value name="GL_AMBIENT"/>
- <value name="GL_DIFFUSE"/>
- <value name="GL_SPECULAR"/>
- <value name="GL_POSITION"/>
-
- <desc name="params" vector_size="4"/>
- </desc>
-
- <desc name="pname">
- <value name="GL_SPOT_DIRECTION"/>
-
- <desc name="params" vector_size="3"/>
- </desc>
-
- <desc name="pname">
- <value name="GL_SPOT_EXPONENT"/>
- <value name="GL_SPOT_CUTOFF"/>
- <value name="GL_CONSTANT_ATTENUATION"/>
- <value name="GL_LINEAR_ATTENUATION"/>
- <value name="GL_QUADRATIC_ATTENUATION"/>
-
- <desc name="params" vector_size="1"/>
- </desc>
</template>
<template name="GetMaterial" direction="get">
diff --git a/src/mesa/main/es1_conversion.c b/src/mesa/main/es1_conversion.c
index ff5e451..ebd1e88 100644
--- a/src/mesa/main/es1_conversion.c
+++ b/src/mesa/main/es1_conversion.c
@@ -263,17 +263,7 @@ _es_GetLightxv(GLenum light, GLenum pname, GLfixed *params)
unsigned int n_params = 4;
GLfloat converted_params[4];
- switch(light) {
- case GL_LIGHT0:
- case GL_LIGHT1:
- case GL_LIGHT2:
- case GL_LIGHT3:
- case GL_LIGHT4:
- case GL_LIGHT5:
- case GL_LIGHT6:
- case GL_LIGHT7:
- break;
- default:
+ if (light < GL_LIGHT0 || light > GL_LIGHT7) {
_mesa_error(_mesa_get_current_context(), GL_INVALID_ENUM,
"glGetLightxv(light=0x%x)", light);
return;
@@ -605,34 +595,6 @@ _es_LightModelxv(GLenum pname, const GLfixed *params)
void GL_APIENTRY
_es_Lightx(GLenum light, GLenum pname, GLfixed param)
{
- switch(light) {
- case GL_LIGHT0:
- case GL_LIGHT1:
- case GL_LIGHT2:
- case GL_LIGHT3:
- case GL_LIGHT4:
- case GL_LIGHT5:
- case GL_LIGHT6:
- case GL_LIGHT7:
- break;
- default:
- _mesa_error(_mesa_get_current_context(), GL_INVALID_ENUM,
- "glLightx(light=0x%x)", light);
- return;
- }
- switch(pname) {
- case GL_SPOT_EXPONENT:
- case GL_SPOT_CUTOFF:
- case GL_CONSTANT_ATTENUATION:
- case GL_LINEAR_ATTENUATION:
- case GL_QUADRATIC_ATTENUATION:
- break;
- default:
- _mesa_error(_mesa_get_current_context(), GL_INVALID_ENUM,
- "glLightx(pname=0x%x)", pname);
- return;
- }
-
_mesa_Lightf(light, pname, (GLfloat) (param / 65536.0f));
}
@@ -643,17 +605,7 @@ _es_Lightxv(GLenum light, GLenum pname, const GLfixed *params)
unsigned int n_params = 4;
GLfloat converted_params[4];
- switch(light) {
- case GL_LIGHT0:
- case GL_LIGHT1:
- case GL_LIGHT2:
- case GL_LIGHT3:
- case GL_LIGHT4:
- case GL_LIGHT5:
- case GL_LIGHT6:
- case GL_LIGHT7:
- break;
- default:
+ if (light < GL_LIGHT0 || light > GL_LIGHT7) {
_mesa_error(_mesa_get_current_context(), GL_INVALID_ENUM,
"glLightxv(light=0x%x)", light);
return;
commit 02344107913f6322360fe4bb09133eda5d57e5b8
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue Sep 20 16:43:43 2011 -0700
mesa/es: Remove redundant hint mode validation
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
diff --git a/src/mesa/main/APIspec.xml b/src/mesa/main/APIspec.xml
index 53d9aa9..d0aaaa3 100644
--- a/src/mesa/main/APIspec.xml
+++ b/src/mesa/main/APIspec.xml
@@ -109,12 +109,6 @@
<desc name="target">
<value name="GL_GENERATE_MIPMAP_HINT"/>
</desc>
-
- <desc name="mode">
- <value name="GL_FASTEST"/>
- <value name="GL_NICEST"/>
- <value name="GL_DONT_CARE"/>
- </desc>
</template>
<template name="Light">
commit a4251da3b220079a8326fcc39bde00ec16240ae1
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue Sep 20 16:21:41 2011 -0700
mesa/es: Remove redundant separate stencil face validation
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
diff --git a/src/mesa/main/APIspec.xml b/src/mesa/main/APIspec.xml
index 0ab404b..53d9aa9 100644
--- a/src/mesa/main/APIspec.xml
+++ b/src/mesa/main/APIspec.xml
@@ -953,12 +953,6 @@
<param name="ref" type="GLint"/>
<param name="mask" type="GLuint"/>
</proto>
-
- <desc name="face">
- <value name="GL_FRONT"/>
- <value name="GL_BACK"/>
- <value name="GL_FRONT_AND_BACK"/>
- </desc>
</template>
<template name="StencilOp">
@@ -1018,12 +1012,6 @@
<param name="zpass" type="GLenum"/>
</proto>
- <desc name="face">
- <value name="GL_FRONT"/>
- <value name="GL_BACK"/>
- <value name="GL_FRONT_AND_BACK"/>
- </desc>
-
<desc name="fail">
<value name="GL_KEEP"/>
<value name="GL_ZERO"/>
commit 9113d0e686caf5f5e28728fa9b2157234aa33662
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue Sep 20 16:20:08 2011 -0700
mesa/es: Remove redundant stencil function validation
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
diff --git a/src/mesa/main/APIspec.xml b/src/mesa/main/APIspec.xml
index fde479d..0ab404b 100644
--- a/src/mesa/main/APIspec.xml
+++ b/src/mesa/main/APIspec.xml
@@ -943,17 +943,6 @@
<param name="ref" type="GLint"/>
<param name="mask" type="GLuint"/>
</proto>
-
- <desc name="func">
- <value name="GL_NEVER"/>
- <value name="GL_LESS"/>
- <value name="GL_LEQUAL"/>
- <value name="GL_GREATER"/>
- <value name="GL_GEQUAL"/>
- <value name="GL_EQUAL"/>
- <value name="GL_NOTEQUAL"/>
- <value name="GL_ALWAYS"/>
- </desc>
</template>
<template name="StencilFuncSeparate">
@@ -970,17 +959,6 @@
<value name="GL_BACK"/>
<value name="GL_FRONT_AND_BACK"/>
</desc>
-
- <desc name="func">
- <value name="GL_NEVER"/>
- <value name="GL_LESS"/>
- <value name="GL_LEQUAL"/>
- <value name="GL_GREATER"/>
- <value name="GL_GEQUAL"/>
- <value name="GL_EQUAL"/>
- <value name="GL_NOTEQUAL"/>
- <value name="GL_ALWAYS"/>
- </desc>
</template>
<template name="StencilOp">
commit 1087745afe0035d2240014697155577f1a0bd573
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue Sep 20 16:19:04 2011 -0700
mesa/es: Remove redundant logic op operand validation
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
diff --git a/src/mesa/main/APIspec.xml b/src/mesa/main/APIspec.xml
index c0e6bc4..fde479d 100644
--- a/src/mesa/main/APIspec.xml
+++ b/src/mesa/main/APIspec.xml
@@ -934,25 +934,6 @@
<return type="void"/>
<param name="opcode" type="GLenum"/>
</proto>
-
- <desc name="opcode">
- <value name="GL_CLEAR"/>
- <value name="GL_SET"/>
- <value name="GL_COPY"/>
- <value name="GL_COPY_INVERTED"/>
- <value name="GL_NOOP"/>
- <value name="GL_INVERT"/>
- <value name="GL_AND"/>
- <value name="GL_NAND"/>
- <value name="GL_OR"/>
- <value name="GL_NOR"/>
- <value name="GL_XOR"/>
- <value name="GL_EQUIV"/>
- <value name="GL_AND_REVERSE"/>
- <value name="GL_AND_INVERTED"/>
- <value name="GL_OR_REVERSE"/>
- <value name="GL_OR_INVERTED"/>
- </desc>
</template>
<template name="StencilFunc">
commit bf03589882ee4b36a9c3fb618a1d5f6b567163db
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue Sep 20 16:17:16 2011 -0700
mesa/es: Remove redundant alpha function validation
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
diff --git a/src/mesa/main/APIspec.xml b/src/mesa/main/APIspec.xml
index c3066af..c0e6bc4 100644
--- a/src/mesa/main/APIspec.xml
+++ b/src/mesa/main/APIspec.xml
@@ -882,16 +882,6 @@
<param name="func" type="GLenum"/>
<param name="ref" type="GLtype"/>
</proto>
- <desc name="func">
- <value name="GL_NEVER"/>
- <value name="GL_LESS"/>
- <value name="GL_EQUAL"/>
- <value name="GL_LEQUAL"/>
- <value name="GL_GREATER"/>
- <value name="GL_NOTEQUAL"/>
- <value name="GL_GEQUAL"/>
- <value name="GL_ALWAYS"/>
- </desc>
</template>
<template name="BlendFunc">
diff --git a/src/mesa/main/es1_conversion.c b/src/mesa/main/es1_conversion.c
index 12cbcd4..ff5e451 100644
--- a/src/mesa/main/es1_conversion.c
+++ b/src/mesa/main/es1_conversion.c
@@ -38,22 +38,6 @@
void GL_APIENTRY
_es_AlphaFuncx(GLenum func, GLclampx ref)
{
- switch(func) {
- case GL_NEVER:
- case GL_LESS:
- case GL_EQUAL:
- case GL_LEQUAL:
- case GL_GREATER:
- case GL_NOTEQUAL:
- case GL_GEQUAL:
- case GL_ALWAYS:
- break;
- default:
- _mesa_error(_mesa_get_current_context(), GL_INVALID_ENUM,
- "glAlphaFuncx(func=0x%x)", func);
- return;
- }
-
_mesa_AlphaFunc(func, (GLclampf) (ref / 65536.0f));
}
commit 8f55d83569aa364ac7c6928c30b13d846d187389
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue Sep 20 16:15:22 2011 -0700
mesa/es: Remove redundant separate stencil mask face validation
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
diff --git a/src/mesa/main/APIspec.xml b/src/mesa/main/APIspec.xml
index a418dca..c3066af 100644
--- a/src/mesa/main/APIspec.xml
+++ b/src/mesa/main/APIspec.xml
@@ -730,12 +730,6 @@
<param name="face" type="GLenum"/>
<param name="mask" type="GLuint"/>
</proto>
-
- <desc name="face">
- <value name="GL_FRONT"/>
- <value name="GL_BACK"/>
- <value name="GL_FRONT_AND_BACK"/>
- </desc>
</template>
<template name="ColorMask">
commit 52d57985c69a0d8dab23db7070e2d83d914438f4
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue Sep 20 16:13:14 2011 -0700
mesa/es: Remove redundant front-face mode validation
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
diff --git a/src/mesa/main/APIspec.xml b/src/mesa/main/APIspec.xml
index e22a5a9..a418dca 100644
--- a/src/mesa/main/APIspec.xml
+++ b/src/mesa/main/APIspec.xml
@@ -88,11 +88,6 @@
<return type="void"/>
<param name="mode" type="GLenum"/>
</proto>
-
- <desc name="mode">
- <value name="GL_CW"/>
- <value name="GL_CCW"/>
- </desc>
</template>
<template name="Hint">
commit e1dbf56a10b08aa51a9186979548fcc929615b27
Author: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue Sep 20 16:09:55 2011 -0700
mesa/es: Remove redundant face culling mode validation
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
diff --git a/src/mesa/main/APIspec.xml b/src/mesa/main/APIspec.xml
index 964a407..e22a5a9 100644
--- a/src/mesa/main/APIspec.xml
+++ b/src/mesa/main/APIspec.xml
@@ -48,12 +48,6 @@
<return type="void"/>
<param name="mode" type="GLenum"/>
Reply to: