summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* make: Don't use builtin_stubs.cpp for standalone GLSL compiler.Kenneth Graunke2011-09-201-4/+4
| | | | | | | | | | | | | | | | builtin_stubs.cpp is only supposed to be used for builtin_compiler. It contains a stub version of _mesa_glsl_initialize_functions() that does nothing. libglsl.a already contains builtin_function.cpp, the generated file that contains a version of _mesa_glsl_initialize_functions() that actually initializes all the built-in functions. By mistakenly linking to builtin_stubs, glsl_compiler and glsl_test are unable to compile any shaders that use built-in functions. Signed-off-by: Kenneth Graunke <[email protected]> Reviewed-by: Paul Berry <[email protected]>
* GLES2/gl2ext: upgrade to gl2ext.h version 15049Ian Romanick2011-09-201-19/+354
|
* mesa: Don't expose compressed paletted formats via ↵Ian Romanick2011-09-201-15/+17
| | | | | | | | | | | | GL_{NUM_,}COMPRESSED_TEXTURE_FORMATS Fixes a bug introduced by commit faf5d65. These formats should only be exposed in OpenGL ES 1.x. Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Adam Jackson <[email protected]> Cc: Xun Fang <[email protected]> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=40860
* gallium: remove trailing comma to silence warningBrian Paul2011-09-201-1/+1
|
* Gallium: Increase PIPE_MAX_CLIP_PLANES to 8.Paul Berry2011-09-201-1/+1
| | | | | | | | Since Mesa is now capable of supporting up to 8 clipping planes instead of 6, this patch updates Gallium internals to support 8 clipping planes as well. Reviewed-by: Brian Paul <[email protected]>
* Gallium: remove unnecessary ifdef for MAX_CLIPPED_VERTICES.Paul Berry2011-09-201-2/+0
| | | | | | | | | | | draw_pipe_clip.c contained an ifdef to ensure that its local definition of MAX_CLIPPED_VERTICES would not take effect if the global MAX_CLIPPED_VERTICES (defined in src/mesa/main/config.h) was already defined. This was unnecessary because draw_pipe_clip.c doesn't directly or indirectly include src/mesa/main/config.h. Removed the ifdef to reduce confusion. Reviewed-by: Brian Paul <[email protected]>
* Increase MAX_CLIP_PLANES to 8Paul Berry2011-09-201-2/+5
| | | | | | | | | | | | This will allow drivers to increase ctx->Const.MaxClipPlanes to 8, which is required for GLSL-1.30 compliance. No driver behavior should be affected. However, many data structures use MAX_CLIP_PLANES as an array size, so these arrays will get slightly larger. Reviewed-by: Kenneth Graunke <[email protected]> Reviewed-by: Ian Romanick <[email protected]>
* Hardcode the default value of ctx->Const.MaxClipPlanes to 6.Paul Berry2011-09-201-1/+1
| | | | | | | | | | | Previously this value was set to MAX_CLIP_PLANES, which is defined to be 6. But MAX_CLIP_PLANES needs to be increased to 8 to support GLSL-1.30-compliant drivers. This patch hard-codes the default value of ctx->Const.MaxClipPlanes to 6, so that when MAX_CLIP_PLANES is increased, it won't affect drivers that do not support 8 clip planes. Reviewed-by: Kenneth Graunke <[email protected]> Reviewed-by: Ian Romanick <[email protected]>
* i965: Remove bogus assertion on MAX_CLIP_PLANES.Paul Berry2011-09-201-1/+0
| | | | | | | | | This patch removes the assertion "MAX_CLIP_PLANES == 6" from the i965 driver. This assertion is unnecessary; nothing in the driver requires MAX_CLIP_PLANES to be 6. Reviewed-by: Kenneth Graunke <[email protected]> Reviewed-by: Ian Romanick <[email protected]>
* mesa: Update clipping code to use ctx->Const.MaxClipPlanes.Paul Berry2011-09-202-3/+3
| | | | | | | | | | | | | To support GLSL 1.30, we will need to increase MAX_CLIP_PLANES to 8. To avoid breaking drivers that do not yet support 8 clip planes, this patch modifies the Mesa core code that pertains to clipping to use ctx->Const.MaxClipPlanes rather than MAX_CLIP_PLANES, since ctx->Const.MaxClipPlanes will remain 6 for drivers that only support 6 clip planes. Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]> Reviewed-by: Ian Romanick <[email protected]>
* scons: Unbreak mingw build.José Fonseca2011-09-201-0/+1
|
* scons: MacOSX build fixes.José Fonseca2011-09-204-14/+12
|
* glsl_to_tgsi: implement ir_binop_all_equal and ir_binop_any_nequal for ↵Bryan Cain2011-09-201-34/+85
| | | | native integers
* i965/vs: Add support for compute-to-MRF.Eric Anholt2011-09-203-0/+179
| | | | | Removes 1.8% of the instructions from 97% of the vertex shaders in shader-db.
* i965/vs: Do VUE writes using the MRF file instead of hardware register.Eric Anholt2011-09-201-4/+6
| | | | We'll only do compute-to-MRF on accesses to this file.
* i965/vs: Handle destinations in the MRF file.Eric Anholt2011-09-201-0/+6
| | | | | We've been referencing MRFs through the HW_REG file so far, but that makes it harder to handle compute-to-MRF and similar optimizations.
* i965/vs: Add a function for how many MRFs get written as part of a SEND.Eric Anholt2011-09-202-0/+39
| | | | | This will be used for compute-to-mrf, which needs to know when MRFs get overwritten.
* i965/vs: Remove dead fields of src_reg.Eric Anholt2011-09-201-2/+0
| | | | | | These were copy and pasted from the FS, and are never used. Reviewed-by: Kenneth Graunke <[email protected]>
* i965/vs: Add support for simple algebraic optimizations.Eric Anholt2011-09-203-0/+96
| | | | | | | | | | | | | | We generate silly code for array access, and it's easier to generally support the cleanup than to specifically avoid the bad code in each place we might generate it. Removes 4.6% of instructions from 41.6% of shaders in shader-db, particularly savage2/hon and unigine. v2: Fixes by Ken: Make is_zero/one member functions, and fix a progress flag. Reviewed-by: Kenneth Graunke <[email protected]>
* i965: Fix polygon stipple offset state flagging.Eric Anholt2011-09-201-4/+6
| | | | | | | | | | | _NEW_WINDOW_POS wasn't a real Mesa state flag, but we were missing _NEW_BUFFERS to update the stipple offset when FBO binding or window size changed, and _NEW_POLYGON to update when stippling gets enabled. Fixes oglconform's tristrip test. Reviewed-by: Kenneth Graunke <[email protected]> Reviewed-by: Yuanhan Liu <[email protected]>
* i965: Add missing _NEW_POLYGON flag to polygon stipple upload.Eric Anholt2011-09-201-1/+3
| | | | | | | | Because we skip the pattern upload when stippling is disabled, we need to check again when it might have been turned on. Reviewed-by: Kenneth Graunke <[email protected]> Reviewed-by: Yuanhan Liu <[email protected]>
* i965: Fix compiler warnings.Eric Anholt2011-09-201-6/+4
|
* mesa: fix error handling for glMaterial*Yuanhan Liu2011-09-201-1/+12
| | | | | | | | | | | | | | | Trigger GL_INVALID_ENUM error if the face paramter is not a valid value. Trigger GL_INVALID_VALUE error if the GL_SHININESS value is out side [0, ctx->Constant.MaxShiniess]. v2: fix the max shininess value. v3: suggested by Brian, move the face check into glMaterialfv function to reduce code duplicate. Also, refactor the error message. Signed-off-by: Yuanhan Liu <[email protected]> Signed-off-by: Brian Paul <[email protected]>
* st/egl: add support for null platformChia-I Wu2011-09-206-2/+219
| | | | | The backend calls null_sw_create() to create sw_winsys. And that is pretty much it...
* egl: add null platformChia-I Wu2011-09-203-0/+8
| | | | | | | The null platform has no window or pixmap surface (but pbuffer surface). And the only valid display is EGL_DEFAULT_DISPLAY. It is useful for offscreen rendering. It works everywhere becase no window system is required.
* configs: remove rest of APP_LIB_DEPS linesDave Airlie2011-09-205-11/+0
| | | | | | pointed out by GArik_ on #radeon. Signed-off-by: Dave Airlie <[email protected]>
* i965/fs: Implement texelFetch() on Gen4.Kenneth Graunke2011-09-192-4/+18
| | | | | Signed-off-by: Kenneth Graunke <[email protected]> Reviewed-by: Eric Anholt <[email protected]>
* i965/fs: Implement texelFetch() on Ivybridge.Kenneth Graunke2011-09-191-4/+21
| | | | | Signed-off-by: Kenneth Graunke <[email protected]> Reviewed-by: Eric Anholt <[email protected]>
* i965/fs: Implement texelFetch() on Ironlake and Sandybridge.Kenneth Graunke2011-09-196-5/+19
| | | | | Signed-off-by: Kenneth Graunke <[email protected]> Reviewed-by: Eric Anholt <[email protected]>
* glapi: Update generated file modified by previous commitIan Romanick2011-09-191-3057/+1814
|
* glapi: Don't emit remap data for individual extensionsIan Romanick2011-09-191-38/+5
| | | | | | | | | | | | | | | All of the extensions actually supported by Mesa have been remapped by remap.c for a long time. Emitting all of these data structures is just clutter. Drivers that need additional functions remapped, should add 'offset="assign"' to the function definition in the .xml file. The changes to remap_helper.h are in a follow-on ~8700 line patch that would surely be rejected by the mailing list. Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Chia-I Wu <[email protected]>
* mesa: Delete stale comment about MESAX extensionsIan Romanick2011-09-191-2/+0
| | | | | | | Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Roland Scheidegger <[email protected]> Reviewed-by: Eric Anholt <[email protected]> Reviewed-by: Marek Olšák <[email protected]>
* mesa: Replace _mesa_rgba_logicop_enabled(ctx) with ↵Ian Romanick2011-09-196-23/+11
| | | | | | | | | | | | ctx->Color.ColorLogicOpEnabled Since GL_EXT_blend_logic_op is removed, _mesa_rgba_logicop_enabled(ctx) just returns ctx->Color.ColorLogicOpEnabled. That seems kind of silly. Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Roland Scheidegger <[email protected]> Reviewed-by: Eric Anholt <[email protected]> Reviewed-by: Marek Olšák <[email protected]>
* mesa: Use ColorLogicOpEnabled instead of _LogicOpEnabledIan Romanick2011-09-1910-25/+7
| | | | | | | | | | Since GL_EXT_blend_logic_op is removed, _LogicOpEnabled and ColorLogicOpEnabled always have the same value. Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Roland Scheidegger <[email protected]> Reviewed-by: Eric Anholt <[email protected]> Reviewed-by: Marek Olšák <[email protected]>
* mesa: Remove support for GL_EXT_blend_logic_opIan Romanick2011-09-194-17/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | Support is removed for four reasons: 1. The implementation was broken with respect to separate blend equations. The GL_EXT_blend_equation_separate spec says: "If EXT_blend_logic_op and EXT_blend_equation_separate are both supported, the logic op blend equation should be supported separately for RGB and alpha as with the other blend equation modes." But Mesa's implementation of GL_LOGIC_OP specifically forbids this. 2. No hardware supported by Mesa can support separate blend equations involving GL_LOGIC_OP. 3. No applications could be found that use this extension. 4. No other Linux OpenGL drivers support this extension. Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Roland Scheidegger <[email protected]> Reviewed-by: Eric Anholt <[email protected]> Reviewed-by: Marek Olšák <[email protected]> Cc: Brian Paul <[email protected]>
* st/mesa: Remove support for GL_EXT_blend_logic_opIan Romanick2011-09-192-10/+1
| | | | | | | | | | It was broken, and it isn't really useful anyway. Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Roland Scheidegger <[email protected]> Reviewed-by: Eric Anholt <[email protected]> Reviewed-by: Marek Olšák <[email protected]> Cc: Brian Paul <[email protected]>
* mesa: Remove unused _mesa_enable_imaging_extensions functionIan Romanick2011-09-192-19/+0
| | | | | | | | | | The last user of this function was driInitExtensions, and that function was removed in a previous commit. Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Roland Scheidegger <[email protected]> Reviewed-by: Eric Anholt <[email protected]> Reviewed-by: Marek Olšák <[email protected]>
* autogen.sh: Honor NOCONFIGURE environment variableColin Walters2011-09-191-1/+3
| | | | | | See http://people.gnome.org/~walters/docs/build-api.txt Signed-off-by: Dave Airlie <[email protected]>
* mesa: Throw an error when starting conditional render on an active query.Eric Anholt2011-09-191-1/+1
| | | | | | | | | | | | | | | From the NV_conditional_render spec: BeginQuery sets the active query object name for the query type given by <target> to <id>. If BeginQuery is called with an <id> of zero, if the active query object name for <target> is non-zero, if <id> is the active query object name for any query type, or if <id> is the active query object for condtional rendering (Section 2.X), the error INVALID OPERATION is generated. Fixes piglit nv_conditional_render-begin-while-active. Reviewed-by: Brian Paul <[email protected]>
* mesa: Throw an error instead of asserting for condrender with query == 0.Eric Anholt2011-09-191-1/+2
| | | | | | | | | | | | | | | From the NV_conditional_render spec: BeginQuery sets the active query object name for the query type given by <target> to <id>. If BeginQuery is called with an <id> of zero, if the active query object name for <target> is non-zero, if <id> is the active query object name for any query type, or if <id> is the active query object for condtional rendering (Section 2.X), the error INVALID OPERATION is generated. Fixes piglit nv_conditional_render-begin-zero. Reviewed-by: Brian Paul <[email protected]>
* mesa: Add support for Begin/EndConditionalRender in display lists.Eric Anholt2011-09-191-0/+45
| | | | | | Fixes piglit nv_conditional_render-dlist. Reviewed-by: Brian Paul <[email protected]>
* mesa: fix an autoconf build-system bug related to glsl_to_tgsiMarek Olšák2011-09-191-3/+2
| | | | | | | | | st_glsl_to_tgsi.cpp was completely ignored by makedepend because it was not included in ALL_SOURCES, which caused that the file was not recompiled when certain header files were changed (like glsl/ir.h). The first part of this commit is just a consolidation. The second part is the fix.
* mesa: fix format/type check in unpack_image() for bitmapsBrian Paul2011-09-191-1/+1
| | | | | Passing type == GL_BITMAP returns 0 while error values return -1. This fixes glPolygonStipple being compiled into display lists.
* i965 new VS: Fix copy propagation of double negatives.Paul Berry2011-09-191-1/+1
| | | | | | | | | | | | | When copy propagating a value into an instruction that negates its argument, we need to invert the sense of the value's "negate" flag, so that -(+x) becomes -x and -(-x) becomes +x. Previously, we were always setting the value's "negate" flag to true in this circumstance, so that both -(+x) and -(-x) turned into -x. Fixes Piglit test vs-double-negative.shader_test. Reviewed-by: Kenneth Graunke <[email protected]>
* mesa: Advertise GL_OES_compressed_paletted_texture in OpenGL ES1.xIan Romanick2011-09-191-1/+1
| | | | | | Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]> Tested-by: Jin Yang <[email protected]>
* mesa: Remove redundant compressed paletted texture error checksIan Romanick2011-09-191-29/+5
| | | | | | Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]> Tested-by: Jin Yang <[email protected]>
* mesa: Refactor compressed texture error checks to work with paletted texturesIan Romanick2011-09-191-11/+70
| | | | | | | | | | | | | This code was really broken before. A lot of the error checks were done much later (too late), and some of the error checks would fail. The underlying problem is that Mesa doesn't ever keep compressed paletted textures in their original format. The textures are immediately converted to some RGB or RGBA format. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=39991 Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]> Tested-by: Jin Yang <[email protected]>
* mesa: Add _mesa_cpal_compressed_format_typeIan Romanick2011-09-192-0/+20
| | | | | | Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]> Tested-by: Jin Yang <[email protected]>
* mesa: Refactor expected texture size check in cpal_get_infoIan Romanick2011-09-192-13/+35
| | | | | | Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]> Tested-by: Jin Yang <[email protected]>
* mesa: Add GL_OES_compressed_paletted_texture formats to _mesa_base_tex_formatIan Romanick2011-09-191-0/+19
| | | | | | Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]> Tested-by: Jin Yang <[email protected]>