summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/master' into gallium-0.2Brian Paul2008-12-3023-218/+479
|\ | | | | | | | | | | Conflicts: src/mesa/main/config.h
| * mesa: fix bug in evaluation of structure fieldsBrian Paul2008-12-301-3/+1
| | | | | | | | Fixes incorrect size information. See bug 19273.
| * mesa: allow variable indexing into the predefined uniform variable arraysBrian Paul2008-12-305-91/+376
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows code such as "vec4 a = gl_LightSource[i].ambient;" to work. When a built-in uniform array is indexed with a variable index we need to "unroll" the whole array into the parameter list (aka constant buffer) because we don't know which elements may be accessed at compile-time. In the case of the gl_LightSource array of size [8], we emit 64 state references into the parameter array (8 elements times 8 vec4s per gl_LightSourceParameters struct). Previously, we only allowed constant-indexed references to uniform arrays (such as gl_LightSource[2].position) which resulted in a single state reference being added to the parameter array, not 64. We still optimize this case. Users should be aware that using "gl_LightSource[i].ambient" in their shaders is a bit expensive since state validation will involve updating all 64 light source entries in the parameter list.
| * mesa: better error message when running out of GLSL samplersBrian Paul2008-12-301-1/+4
| |
| * mesa: comments for some state varsBrian Paul2008-12-301-4/+4
| |
| * mesa: increase max constants/uniforms to 256 (vec4 vectors)Brian Paul2008-12-301-2/+2
| |
| * mesa: updated compilation documentationBrian Paul2008-12-302-31/+39
| |
| * demos: minor fixes to twoside.c glsl demoBrian Paul2008-12-301-16/+28
| |
| * intel: disable ATI_texture_env_combine3 for i830( and related device).Xiang, Haihao2008-12-302-1/+2
| | | | | | | | Thanks to Eric for pointing it out.
| * dri: Fix driWaitForMSC32 when divisor >= 2 and msc < 0.Eric Anholt2008-12-291-9/+9
| | | | | | | | | | | | | | | | | | | | We'd come up with a negative remainder, while we were looking for the positive version of it in the loop conditional. And, since the "did we hit our target" break was disabled for the target_msc == 0 ("Just make the divisor/remainder work") path, we'd never exit. Simplify the code by just using int64_t all over instead of trying to do it in a u32 space.
| * R300: missing semicolonAlex Deucher2008-12-291-1/+1
| |
| * intel: enable ATI_texture_env_combine3. Fixes #17707Xiang, Haihao2008-12-291-0/+1
| |
| * r300: remove the unknowns from the indx_buffer codeDave Airlie2008-12-282-5/+6
| |
| * i915: separate the fog term from the specular color term.Xiang, Haihao2008-12-241-19/+3
| | | | | | | | | | | | | | | | Previously fog parameter and specular color are packed into the same dword. Note specular color should be packed in BGRA for device, so if fog parameter and specular color all are present, fog parameter will dirty the alpha term of specular color. This fixes rendering issue when playing 'Yo Frankie' on 915/945.
| * intel: Fix glBitmap clipping for DRI1.Eric Anholt2008-12-231-2/+2
| |
| * Remove third buffer support from Mesa.Dave Airlie2008-12-236-35/+3
| | | | | | | | This is part of the deprecated pageflipping infrastructure.
* | gallium: Initialize var before use.José Fonseca2008-12-301-1/+1
| |
* | glut: List new source file in sconscript.José Fonseca2008-12-301-0/+1
| |
* | mesa: Do not specify types in bitfields.José Fonseca2008-12-301-2/+2
| | | | | | | | As advised by gcc -pedantic.
* | draw: Do not specify types in bitfields.José Fonseca2008-12-301-3/+3
| | | | | | | | As advised by gcc -pedantic.
* | gallium: Remove unused variables.José Fonseca2008-12-303-3/+0
| |
* | gallium: Don't redefine INLINE.José Fonseca2008-12-301-14/+16
| | | | | | | | INLINE is commonly used in third-party headers.
* | scons: Specify C99 throughout all the tree.José Fonseca2008-12-302-5/+2
| | | | | | | | | | | | | | | | | | | | MSVC may not support full C99, but supports more than plain C90. And -pedantic without -std=c99 generates too many spurious warnings (specially C++ style comments) to be of any use. Note that using certain C99 features in the cross-platform parts of Gallium is still not possible; namely mid-of-scope variable declarations and named structure initializers will break MSVC builds.
* | rtasm: Remove spurious semi-colons after function bodies.José Fonseca2008-12-301-5/+5
| |
* | gdi: Remove accidental keypresses.José Fonseca2008-12-301-1/+1
| |
* | egl: fix egl closureAlan Hourihane2008-12-231-2/+29
| |
* | egl: fix startup query versionAlan Hourihane2008-12-231-4/+8
| |
* | egl: support GLXFBConfigs, pbuffers and pixmaps.Alan Hourihane2008-12-231-13/+246
| |
* | Merge commit 'origin/gallium-0.1' into gallium-0.2José Fonseca2008-12-228-6/+482
|\ \ | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/util/Makefile
| * | softpipe: initialize refcount and winsysJerome Glisse2008-12-221-0/+2
| | |
| * | softpipe: convert to use texture instead of surfaceJerome Glisse2008-12-221-35/+30
| | |
| * | gallium: const correctness.José Fonseca2008-12-224-18/+18
| | |
| * | Ignore new tests executables.José Fonseca2008-12-211-5/+20
| | |
| * | gallium: Fix typo in define name.José Fonseca2008-12-201-1/+1
| | |
| * | gallium: Simple and efficient cache.José Fonseca2008-12-196-0/+476
| | | | | | | | | | | | | | | | | | | | | Fixed size hash table. Collisions are handled by simply destroying the previous entry. It hasn't received much testing yet.
| * | gallium: replace #elif with #elseBrian Paul2008-12-191-1/+1
| | |
| * | tgsi: scan for additional info: uses_fogcoord, uses_frontfacingBrian Paul2008-12-182-15/+37
| | |
| * | gallium: fix two-sided lighting test in state trackerBrian Paul2008-12-181-3/+6
| | | | | | | | | | | | This fixes two-sided lighting for vertex shaders.
| * | Gallium: fix for conform testRobert Ellison2008-12-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following construction in util_surface_copy() in gallium/auxiliary/util/u_rect.c, introduced in commit d177c9ddda2c452cf7d6696d89cf4458ef986f98, incorrectly inverts the Y coordinate in the last parameter to pipe_copy_rect(). /* If do_flip, invert src_y position and pass negative src stride */ pipe_copy_rect(dst_map, &dst->block, dst->stride, dst_x, dst_y, w, h, src_map, do_flip ? -(int) src->stride : src->stride, src_x, do_flip ? w - src_y : src_y); The intention is to start at the last Y coordinate line and move backwards, in the case of a flip; in that case, the correct calculation is "src_y + h - 1", not "w - src_y". This fixes a Gallium assertion failure in the conformance tests: u_rect.c:65:pipe_copy_rect: Assertion `src_y >= 0' failed. debug_get_bool_option: GALLIUM_ABORT_ON_ASSERT = TRUE Trace/breakpoint trap
| * | glsl: Fix handling of nested parens in macro actual arguments.Michal Krol2008-12-181-2/+15
| | |
| * | mesa: Pass the context to query object delete cb to avoid null dereference.Eric Anholt2008-12-181-1/+1
| | |
| * | gallium: Enable memory debugging on all windows platforms.José Fonseca2008-12-181-1/+1
| | |
| * | mesa: choose GLSL vertex shader over ARB/internal vertex program in ↵Brian Paul2008-12-171-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get_fp_input_mask() This is a work-around the for the fact that we do fragment shader state validation before vertex shader validation (see comments in state.c) so in get_fp_input_mask() we can't rely on ctx->VertexProgram._Current being up to date yet. This fixes a glean glsl1 test failure.
| * | gallium: fix memory corruption in u_gen_mipmap.cBrian Paul2008-12-171-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the old/initial vbuf allocation in util_create_gen_mipmap(). We were allocating a small vbuf at this point so get_next_slot() didn't have as large of buffer as it expected. So all but the first set_vertex_data() was writing out of bounds. Also added some comments.
| * | mesa: fix fixed-function test in get_fp_input_mask() - again.Brian Paul2008-12-171-3/+5
| | | | | | | | | | | | | | | | | | The problem we're solving only occured when there was a user-defined vertex shader but no fragment shader. Check for that case now. Fixes glean api2 vertex array failure.
| * | mesa: add missing cases for texture array targetsBrian Paul2008-12-171-6/+10
| | |
| * | Revert "mesa: fix vertex program test in get_fp_input_mask()"Brian Paul2008-12-171-1/+3
| | | | | | | | | | | | This reverts commit cdaaf8e107010624bed4abdf9553c0ef63c8b708.
| * | mesa: fix vertex program test in get_fp_input_mask()Brian Paul2008-12-171-3/+1
| | | | | | | | | | | | | | | We were accidentally using the fixed-function logic when a vertex shader was being used.
| * | winsys: fix depth buffer size when using stencilBrian Paul2008-12-171-0/+3
| | |
| * | gallium: Fix PIPE_FORMAT_X8B8G8R8_SNORM definition.Michal Krol2008-12-151-1/+1
| | |