Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'origin/master' into gallium-0.2 | Alan Hourihane | 2009-01-16 | 13 | -17/+80 |
|\ | | | | | | | | | Conflicts: src/mesa/shader/slang/slang_compile.c | ||||
| * | glsl: fix broken sampler assignments | Brian Paul | 2009-01-16 | 1 | -1/+2 |
| | | |||||
| * | i915: fallback on transfer mode | Xiang, Haihao | 2009-01-16 | 1 | -0/+6 |
| | | |||||
| * | windows: updated mesa.def file | Karl Schultz | 2009-01-15 | 1 | -0/+5 |
| | | |||||
| * | glsl: use _mesa_sprintf() | Brian Paul | 2009-01-15 | 1 | -2/+2 |
| | | |||||
| * | glsl: move declaration before code | Brian Paul | 2009-01-15 | 1 | -1/+1 |
| | | |||||
| * | mesa: check frambuffer complete status before rendering | Alan Hourihane | 2009-01-15 | 1 | -13/+20 |
| | | |||||
| * | mesa: bump version to 7.3-rc2mesa_7_3_rc2 | Brian Paul | 2009-01-14 | 1 | -1/+1 |
| | | |||||
| * | glsl: fix comment | Brian Paul | 2009-01-14 | 1 | -1/+1 |
| | | |||||
| * | glsl: minor clean-up for rect sampler test | Brian Paul | 2009-01-14 | 1 | -5/+18 |
| | | |||||
| * | r300: work-around FRAG_BIT_FOGC warning/error | Brian Paul | 2009-01-14 | 2 | -0/+12 |
| | | | | | | | | | | | | | | See bug 17929. Fog doesn't actually work, but the often complained about warning is silenced. | ||||
| * | i965: asst. fixes, work-arounds for FBOs and render to texture | Brian Paul | 2009-01-14 | 3 | -2/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenGL allows mixing and matching depth and stencil renderbuffers in framebuffer objects while the hardware really only supports interleaved depth/stencil buffers. This makes for some tricky buffer management. An extra wrinkle is the situation where the user allocates a 16bpp depth texture or renderbuffer then tries to render to it along with a stencil buffer. We'd have to promote the 16bpp Z values to 24-bit Z values and mix in the stencil values to setup the depth/stencil renderbuffer. There's no support for that now, so always allocate 32bpp depth textures/ renderbuffers for now. | ||||
| * | i965: fix incorrect renderbuffer DataType assignment | Brian Paul | 2009-01-14 | 1 | -2/+6 |
| | | |||||
| * | i965: fix some FBO depth/stencil assertions | Brian Paul | 2009-01-14 | 1 | -2/+5 |
| | | |||||
* | | stw: Dispatch to our stw_winsys::flush_front_buffer | José Fonseca | 2009-01-16 | 2 | -0/+27 |
| | | | | | | | | | | pipe_winsys::flush_front_buffer should die someday, but this is good enough for now. | ||||
* | | mesa: tweak to formatting | Alan Hourihane | 2009-01-15 | 1 | -2/+2 |
| | | |||||
* | | mesa: small cleanup | Alan Hourihane | 2009-01-15 | 1 | -6/+5 |
| | | |||||
* | | mesa: revert partial commit for 0x0 render targets | Alan Hourihane | 2009-01-15 | 1 | -5/+4 |
| | | |||||
* | | mesa: check frambuffer complete status before rendering | Alan Hourihane | 2009-01-15 | 1 | -13/+20 |
| | | |||||
* | | mesa: Fix merge conflicts | Jakob Bornecrantz | 2009-01-15 | 1 | -15/+0 |
| | | |||||
* | | 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... |