summaryrefslogtreecommitdiffstats
path: root/src/mesa
Commit message (Collapse)AuthorAgeFilesLines
* mesa: glsl compiler debug codeBrian Paul2009-01-061-141/+151
| | | | | | RETURN0 macro reports file/line before returning zero. (cherry picked from commit bf7f9d2143a892bc11a5e2b84e3d6d3ed69fb5e8)
* mesa: rework GLSL array code generationBrian Paul2009-01-065-160/+371
| | | | | | | | | | | | | | | | We now express arrays in terms of indirect addressing. For example: dst = a[i]; becomes: MOV dst, TEMP[1 + TEMP[2].y]; At instruction-emit time indirect addressing is converted into ARL/ ADDR-relative form: ARL ADDR.x, TEMP[2].y; MOV dst, TEMP[1 + ADDR.x]; This fixes a number of array-related issues. Arrays of arrays and complex array/struct nesting works now. There may be some regressions, but more work is coming. (cherry picked from commit ae0ff8097b85d3537a7be1674d55a44a9bd6018e)
* mesa: don't realloc instruction buffer so oftenBrian Paul2009-01-061-13/+22
| | | | (cherry picked from commit e709d68d92ef6f2392b118d0a22452e8f4c53e9a)
* mesa: updated commentBrian Paul2009-01-061-0/+2
| | | | (cherry picked from commit d9fa9e3290611944d5fd52301645367eeeb24f03)
* mesa: fix merge conflict left-oversBrian Paul2009-01-061-1/+0
|
* mesa: no longer need Writemask field in GLSL IR nodesBrian Paul2009-01-064-69/+23
| | | | | | The Swizzle and Size fields carry all the info we need now. (cherry picked from commit 80d6379722a1249ce13db79a898d340644936f67)
* mesa: revamp GLSL instruction emit codeBrian Paul2009-01-061-244/+381
| | | | | | | | | | | | | | | | | This is a step toward better array handling code. In particular, when more than one operand of an instruction uses indirect addressing, we'll need some temporary instructions and registers. By converting IR storage to instruction operands all in one place (emit_instruction()) we can be smarter about this. Also, somewhat better handling of dst register swizzle/writemask handling. This results in tighter writemasks on some instructions which is good for SOA execution. And, cleaner instruction commenting with inst_comment(). Next: remove some more dead code and additional clean-ups... (cherry picked from commit 3a7ed9779b159f9dccbc98d1d556be2cd83cc1fd)
* mesa: make writemask_string() non-staticBrian Paul2009-01-062-4/+8
| | | | | | | | (cherry picked from commit 610c2461ce0683ca5412e4b2b7a496f67e9d3704) Conflicts: src/mesa/shader/prog_print.c
* mesa: remove some do-nothing GLSL codeBrian Paul2009-01-061-16/+0
| | | | (cherry picked from commit 4c167f8fc1e56b6c82d8917c237e70531e3d57b9)
* mesa: fix accidental regression in GLSL built-in texture matrix lookupBrian Paul2009-01-061-1/+5
| | | | | | | | | | Was broken by commit 9aca9a4b72b2a7b378e50bd88f9c3324d07375ec. (cherry picked from commit fe984aed5a9ee7c6e000d48a0a584b964fefa848) Conflicts: src/mesa/shader/slang/slang_builtin.c
* mesa: remove unused/obsolete __NormalMatrixTranspose matrixBrian Paul2009-01-063-188/+184
| | | | (cherry picked from commit e556cc82f83716a734ed9d76356ba49bb670004f)
* mesa: tweak program register printing for RelAddr caseBrian Paul2009-01-061-1/+1
| | | | (cherry picked from commit 557fde9531289b4388a3080b89c2ebaa38abeaee)
* mesa: allow relative indexing into all register files and indirect dst ↵Brian Paul2009-01-063-93/+111
| | | | | | | | | | register indexing (cherry picked from commit f4361540f8dd3016571523863b33481cba7a0c07) Conflicts: src/mesa/shader/prog_execute.c
* mesa: track initialization status of uniform variables. Plus, asst clean-ups.Brian Paul2009-01-067-31/+52
| | | | (cherry picked from commit 2d76a0d77af7be9539f89cba37ce84338c1cdda4)
* mesa: initial support for uniform variable initializers.Brian Paul2009-01-061-5/+22
| | | | | | | This lets one specify initial values for uniforms in the code, avoiding the need to call glUniform() in some cases. (cherry picked from commit 379ff8c9567940ebff44870cf7b0202882445fa6)
* mesa: allows 'f' suffix on GLSL float literalsBrian Paul2009-01-062-6/+16
| | | | (cherry picked from commit 80c8017a643dfb655e4e1500e1c57e3908529c27)
* mesa: add support for 'centroid' qualifier in GLSL 1.20Brian Paul2009-01-0611-2600/+2708
| | | | | | | | (cherry picked from commit 87d1a26ba38e75f6988e094dbfbc0f77c0ae502b) Conflicts: src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
* mesa: add support for 'invariant' keyword for GLSL 1.20Brian Paul2009-01-0611-2615/+2755
| | | | | | | | (cherry picked from commit 448156f769ebf271a6a8c03c61588c3e6c6363f0) Conflicts: src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
* mesa: reformat comments, rewrap lines, etc for a little better readabilityBrian Paul2009-01-062-402/+418
| | | | (cherry picked from commit b632e5aa7f948ed5bbf7104682ec3ee463af4c0a)
* scons: Specify C99 throughout all the tree.José Fonseca2009-01-051-5/+1
| | | | | | | | | | 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.
* gallium: fix two-sided lighting test in state trackerBrian Paul2008-12-181-3/+6
| | | | This fixes two-sided lighting for vertex shaders.
* 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
|
* 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.
* 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.
* gallium: fix refcount bug introduced in eb20e2984Keith Whitwell2008-12-121-4/+5
|
* gallium: avoid mapping same vertex buffer in subsequent framesKeith Whitwell2008-12-1210-25/+99
| | | | | | | | | | | Quite a few util modules were maintaining a single vertex buffer over multiple frames, and potentially reusing it in subsequent frames. Unfortunately that would force us into syncrhonous rendering as the buffer manager would be forced to wait for the previous rendering to complete prior to allowing the map. This resolves that issue, but requires the state tracker to issue a few new flush() calls at the end of each frame.
* st: reduce unnecessary calls to pipe->set_vertex_buffers()Keith Whitwell2008-12-121-5/+14
|
* st: move feedback draw function to new fileKeith Whitwell2008-12-124-226/+276
|
* st: don't unilaterally ABS the argument to RSQKeith Whitwell2008-12-121-3/+9
|
* mesa: Bring in new mesa sub-statetracker.José Fonseca2008-12-1226-0/+4453
| | | | Some code cleanup is still in order.
* gallium: only mark back color buffer surfaces as undefined after swapbuffersBrian Paul2008-12-101-9/+11
| | | | | Marking all surfaces as undefined was wrong and cause some glean failures because glReadPixels was used after SwapBuffers.
* gallium: fix glBitmap color bugBrian Paul2008-11-261-6/+18
| | | | | | By time we get around to rendering the cached bitmap, the current color may have changed. Need to make sure we load the constant slot with the cached color.
* gallium: replace 2 with PIPE_SHADER_TYPESBrian Paul2008-11-261-1/+1
|
* gallium: fix inverted raster pos when drawing into FBOBrian Paul2008-11-241-1/+4
|
* mesa: Don't call fence_finish with a null fence.José Fonseca2008-11-241-2/+4
|
* mesa: restore the negate flag of dots in build_lighting.Xiang, Haihao2008-11-111-0/+3
| | | | | Dots is re-used if more than one light is enabled. Previously the negate flag of dots may affect next light.
* dri: alloc __DRIscreen object with calloc()Brian Paul2008-11-101-1/+1
| | | | | Conflicts: src/mesa/drivers/dri/common/dri_util.c
* mesa: fix logic error in GLSL linker when looking for main() shadersBrian Paul2008-11-101-5/+10
|
* Mesa: fix number of buffers in st_draw_vbo().Pekka Paalanen2008-11-101-1/+1
| | | | | | | The clean-up call to pipe->set_vertex_buffers() should use the same number of buffers as the first call. Signed-off-by: Pekka Paalanen <[email protected]>
* mesa: use _bfc0 instead of _col0 when building back face lighting.Brian Paul2008-11-071-3/+2
| | | | cherry-picked from master: 4550b0562d5b59890fccb0e7eb0dbef967d1ccf9
* mesa: update the shader programs->TexturesUsed array at link timeBrian Paul2008-11-063-4/+26
| | | | | | | | If an application never calls glUniform() to set sampler variable values they'll remain 0 (the default value/unit). Now call _mesa_update_shader_textures_used() at link time in case glUniform() is never called. program->TextureUsed[] will then be correct for state validation.
* gallium: added st_print_shaders() function to help w/ debuggingBrian Paul2008-11-062-0/+20
|
* gallium: added check for degenerate drawing callsBrian Paul2008-11-051-0/+3
|
* gallium: if VERBOSE_GLSL flag is set, check for non-initialized uniforms at ↵Brian Paul2008-11-051-0/+27
| | | | | | | draw time This will warn the user that the shader being run may be using uninitialized uniform variables.
* mesa: fix a GLSL array indexing codegen bugBrian Paul2008-11-052-8/+101
| | | | Expressions like array[i] + array[j] didn't work properly before.
* mesa: remove extra \n from printf stringBrian Paul2008-11-051-1/+1
|