Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'origin/master' into gallium-0.2 | Alan Hourihane | 2009-01-14 | 45 | -165/+1248 |
|\ | | | | | | | | | | | | | | | | | | | | | Conflicts: docs/install.html docs/relnotes-7.3.html src/mesa/shader/slang/slang_codegen.c src/mesa/shader/slang/slang_compile.c src/mesa/shader/slang/slang_emit.c src/mesa/shader/slang/slang_preprocess.c src/mesa/shader/slang/slang_preprocess.h | ||||
| * | intel: SW fallback maps texture images, not texture coordinates | Ian Romanick | 2009-01-14 | 1 | -2/+2 |
| | | |||||
| * | glsl: propagate pragma info down into compiler from preprocessor | Brian Paul | 2009-01-14 | 8 | -24/+90 |
| | | |||||
| * | glsl: simplify IR storage for samplers | Brian Paul | 2009-01-14 | 4 | -13/+34 |
| | | | | | | | | Don't overload the Size field with the texture target, to avoid confusion. | ||||
| * | mesa: fix incorrect transformation of GL_SPOT_DIRECTION | Brian Paul | 2009-01-14 | 2 | -1/+14 |
| | | | | | | | | This was changed between GL 1.0 and 1.1. Mesa still had the 1.0 behaviour. | ||||
| * | Treat image units and coordinate units differently. | Ian Romanick | 2009-01-14 | 1 | -3/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | Previously MaxTextureUnits was used to validate both texture image units and texture coordinate units in fragment programs. Instead, use MaxTextureCoordUnits for texture coordinate units and MaxTextureImageUnits for texture image units. Fixes bugzilla #19468. Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]> | ||||
| * | glsl: fix regression from sampler arrays commit | Alan Hourihane | 2009-01-14 | 1 | -3/+1 |
| | | |||||
| * | i965: indentation fixes | Brian Paul | 2009-01-14 | 2 | -9/+15 |
| | | |||||
| * | i965: allow larger AA points on fallback path | Brian Paul | 2009-01-14 | 1 | -0/+3 |
| | | |||||
| * | i965: fix indentation | Brian Paul | 2009-01-14 | 1 | -5/+6 |
| | | |||||
| * | i965: comment for emit_kil() | Brian Paul | 2009-01-14 | 1 | -0/+4 |
| | | |||||
| * | mesa: put _NV suffix on a few opcodes | Brian Paul | 2009-01-14 | 1 | -5/+6 |
| | | |||||
| * | i965: fix indentation | Brian Paul | 2009-01-14 | 1 | -7/+7 |
| | | |||||
| * | intel: bump driver date | Xiang, Haihao | 2009-01-14 | 1 | -1/+1 |
| | | |||||
| * | glsl: fix a comment typo | Alan Hourihane | 2009-01-14 | 1 | -1/+1 |
| | | |||||
| * | glsl: support sampler arrays. | Alan Hourihane | 2009-01-14 | 3 | -11/+49 |
| | | |||||
| * | glsl: add preprocessor support for #pragma | Brian Paul | 2009-01-13 | 3 | -1/+74 |
| | | | | | | | | | | | | Two forms are supported: Pragmas are silently ignored at this time. | ||||
| * | windows: try to create a context in wglCreateLayerContext() | Karl Schultz | 2009-01-13 | 1 | -1/+2 |
| | | |||||
| * | i965: fix glDrawPixels Z coordinate in intel_texture_drawpixels(). | Brian Paul | 2009-01-12 | 1 | -4/+8 |
| | | | | | | | | As for glBitmap, it needs to be an NDC coord in [-1,1]. | ||||
| * | i965: fix broken glBitmap + depth test | Brian Paul | 2009-01-12 | 1 | -4/+16 |
| | | | | | | | | | | | | | | | | | | When we use the do_blit_bitmap() function, it seems the fragment Z is always 1.0. If depth testing is on, that means that bitmap fragments are often occluded by other rendering. So, the bitmap doesn't appear even if rasterpos.Z==0. The fix is to use the intel_texture_bitmap() path when depth testing is on. Also, fix the incorrect Z coordinate. It needs to be an NDC value in [-1,1]. | ||||
| * | i965: fix broken ARB fp fog options | Brian Paul | 2009-01-12 | 2 | -52/+6 |
| | | | | | | | | | | | | | | Just call _mesa_append_fog_code() if the fragment program's FogOption is not GL_NONE. This allows us to remove some unnecessary i965 fog code. Note, the arbfplight.c demo can be used to test this (see DO_FRAGMENT_FOG). | ||||
| * | glsl: better fix for for-loop scope issue (commit ↵ | Brian Paul | 2009-01-12 | 3 | -31/+4 |
| | | | | | | | | 6333005f7aea3e5d1d86a5c47b3fa2a1ed2f3ff0) | ||||
| * | Big endian fixes. | Matthieu Herrb | 2009-01-11 | 1 | -1/+2 |
| | | |||||
| * | build fix on big endian OpenBSD architectures. | Matthieu Herrb | 2009-01-11 | 1 | -0/+6 |
| | | |||||
| * | replace nearbyint() by rint() for now. | Matthieu Herrb | 2009-01-11 | 1 | -1/+1 |
| | | |||||
| * | __builtin_expect is a gcc 3.x feature. define it out for gcc 2.95. | Matthieu Herrb | 2009-01-11 | 1 | -0/+4 |
| | | | | | | | | Patch suggested by miod@. Thanks. | ||||
| * | mesa: deprecate GL/amesa.h header (allegro driver) | Brian Paul | 2009-01-10 | 2 | -1/+66 |
| | | |||||
| * | mesa: deprecate the GL/fxmesa.h header | Brian Paul | 2009-01-10 | 2 | -1/+104 |
| | | |||||
| * | xmesa: deprecate the "XMesa" interface | Brian Paul | 2009-01-10 | 7 | -4/+709 |
| | | | | | | | | | | Move the include/GL/xmesa*.h files to src/mesa/drivers/x11/ so they're no longer considered public. | ||||
| * | glsl: force creation of new scope for for-loop body | Brian Paul | 2009-01-10 | 1 | -0/+18 |
| | | | | | | | | | | | | | | | | | | | | | | Fixes regression in progs/demos/convolution.c due to loop unrolling. This also allows the following to be compiled correctly: for (int i = 0; i < n; i++) { int i; ... } This fix is a bit of a hack, however. The better fix would be to change the slang_shader.syn grammar. Will revisit that... | ||||
| * | glsl: replace 0/1 with GL_FALSE/GL_TRUE | Brian Paul | 2009-01-10 | 1 | -18/+18 |
| | | |||||
| * | swrast: Fix GL_ATI_separate_stencil | Ian Romanick | 2009-01-09 | 1 | -0/+2 |
| | | | | | | | | | | | | GL_ATI_separate_stencil is enabled by default for software rasterizers, but the extension functions weren't hooked up to the dispatch table. | ||||
| * | glsl: make minimum struct size = 2, not 1 | Brian Paul | 2009-01-09 | 1 | -1/+8 |
| | | | | | | | | | | | | | | 1-component structs such as "struct foo { float x; }" could get placed at any position within a register. This caused some trouble computing the field offset which assumed all struct objects were placed at R.x. It would be unusual to hit this case in normal shaders. | ||||
| * | glsl: fix typo in the vec2 += operator function | Brian Paul | 2009-01-08 | 2 | -2/+2 |
| | | |||||
| * | mesa: set version string to 7.3-rc1 | Brian Paul | 2009-01-08 | 1 | -1/+1 |
| | | |||||
| * | glsl: fix broken +=, -=, *=, /= operators | Brian Paul | 2009-01-08 | 2 | -737/+786 |
| | | | | | | | | | | | | | | These functions need to return the final computed value. Now expressions such as a = (b += c) work properly. Also, no need to use __asm intrinsics in these functions. The resulting code is the same when using ordinary arithmetic operators and is more legible. | ||||
| * | mesa: fix off-by-one bug in _mesa_delete_instructions() | Brian Paul | 2009-01-08 | 1 | -1/+1 |
| | | |||||
| * | i965: Fix GLSL FS DPH to return the right value instead of src0.w * src1.w. | Eric Anholt | 2009-01-07 | 1 | -1/+1 |
| | | |||||
| * | i965: Remove worrisome comment about _NEW_PROGRAM signaling fp change. | Eric Anholt | 2009-01-07 | 1 | -4/+0 |
| | | | | | | | | | | Everything now depends on either BRW_NEW_FRAGMENT_PROGRAM or BRW_NEW_VERTEX_PROGRAM. | ||||
| * | mesa: Remove _Active and _UseTexEnvProgram flags from fragment programs. | Eric Anholt | 2009-01-07 | 8 | -41/+5 |
| | | | | | | | | | | | | | | | | There was a note in state.c about _Active deserving to die, and there were potential issues with it due to i965 forgetting to set _UseTexEnvProgram. Removing both simplifies things. Reviewed-by: Brian Paul <[email protected]> | ||||
| * | i965: Remove dead brw_vs_tnl.c | Eric Anholt | 2009-01-07 | 3 | -61/+0 |
| | | |||||
| * | i965: allow gl_FragData[0] usage when there's only one color buffer | Brian Paul | 2009-01-07 | 1 | -2/+9 |
| | | | | | | | | If gl_FragData[0] is written but not gl_FragCOlor, use the former. | ||||
| * | mesa: additional case in file_string() | Brian Paul | 2009-01-07 | 1 | -0/+2 |
| | | |||||
| * | glsl: pass GLcontext::Extension info down into GLSL preprocessor | Brian Paul | 2009-01-07 | 3 | -35/+65 |
| | | | | | | | | Now the #extension directives can be handled properly. | ||||
| * | glsl: bump up MAX_FOR_LOOP_UNROLL_COMPLEXITY | Brian Paul | 2009-01-07 | 1 | -1/+1 |
| | | |||||
| * | glsl: check that the fragment shader does not write both gl_FragColor and ↵ | Brian Paul | 2009-01-07 | 1 | -0/+11 |
| | | | | | | | | gl_FragData[] | ||||
| * | i965: init dst reg RelAddr field to zero | Brian Paul | 2009-01-07 | 1 | -1/+2 |
| | | |||||
| * | i965: Note when we drop saturate mode on the floor in a VP. | Eric Anholt | 2009-01-07 | 1 | -0/+5 |
| | | |||||
| * | i965: Add support for LRP in VPs. | Eric Anholt | 2009-01-07 | 1 | -0/+42 |
| | | | | | | | | Bug #19226. | ||||
| * | mesa: Add _mesa_snprintf. | José Fonseca | 2009-01-07 | 5 | -7/+22 |
| | | | | | | | | | | | | On Windows snprintf is renamed as _snprintf. (cherry picked from commit f8f9a1b620d31d1a59855fd502caed325d4a324f) |