summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
Commit message (Collapse)AuthorAgeFilesLines
* mesa: increase MAX_UNIFORMS to 1024 (of vec4 type)Brian Paul2009-02-181-1/+1
| | | | | | | | Old limit was 256. Note that no arrays are declared to this size. The only place we have to be careful about raising this limit is the prog_src/dst_register Index bitfields. These have been bumped up too. Added assertions to check we don't exceed the bitfield in the future too.
* mesa: add some debug code to help diagnose incomplete FBO attachments (disabled)Brian Paul2009-02-171-0/+27
|
* mesa: turn on reporting of GLSL version 1.20Brian Paul2009-02-172-3/+3
| | | | | | The new array features, precision/invariant/centroid qualifiers, etc. were done a while back. The glGetString(GL_SHADING_LANGUAGE_VERSION) query returns "1.20" now (for drivers that support it anyway).
* i965: Eric Anholt's patch for bumping up texture sizesRobert Ellison2009-02-131-4/+4
| | | | | | | | | | | | | I'm committing this because it fixes a conform failure; the failure occurs on the TextureProxy test, where the test attempts to create proxy textures at every level, but fails at the last level (border == 1, width == 1, height == 1) because it's beyond MAX_TEXTURE_LEVELS. Eric's original comment was: idr said that in his review swrast was ready for it, and the 965 driver is advertising it already though it has been resulting in many crashes due to arrays using these defines not being big enough.
* mesa: add additional texture size/limit assertionsBrian Paul2009-02-131-5/+13
|
* glDrawBuffers(n==0) is validRobert Ellison2009-02-121-3/+8
| | | | | | | | | | | | | | According to the GL spec, calling glDrawBuffers() with n == 0 is a valid operation (and essentially prevents drawing to any buffers). But _msa_DrawBuffersARB() was producing a GL_INVALID_VALUE error in this case. This fix adjusts the error check, and makes a small change to the ctx->Driver.DrawBuffer() call below to ensure that, if n == 0, Driver.DrawBuffer() is called with GL_NONE and that buffers[0] is *not* referenced in this case (since we don't know whether it is valid). Internal identifier: 365833
* mesa: don't include m_xform.h where not neededBrian Paul2009-02-127-7/+1
|
* mesa: move _mesa_transform_vector() from m_xform.c to m_matrix.cBrian Paul2009-02-121-1/+1
| | | | | m_xform.c is omitted from gallium builds but _mesa_transform_vector() is still needed.
* mesa: restore FLUSH_VERTICES() in _mesa_notifySwapBuffers()Brian Paul2009-02-121-0/+1
|
* mesa: get rid of _math_init()Brian Paul2009-02-111-7/+0
| | | | | | | | | | | Only VBO uses the evaluator code so call _math_init_eval() there. Only TNL uses the transform/translate code so call _math_init_transformation() and _math_init_translate9) there. This is a step toward resolving some symbol collisions between Mesa's and gallium's x86 codegen. Have VBO and TNL modules call _math_init_transformation()
* mesa: Move statements after declarations.José Fonseca2009-02-111-1/+1
|
* Merge commit 'origin/gallium-master-merge'Brian Paul2009-02-1033-211/+871
|\ | | | | | | | | | | | | | | | | | | | | | | This is the big merge of the gallium-0.2 branch into master. gallium-master-merge was just the staging area for it. Both gallium-0.2 and gallium-master-merge are considered closed now. Conflicts: progs/demos/Makefile src/mesa/main/state.c src/mesa/main/texenvprogram.c
| * Merge commit 'origin/gallium-0.2' into gallium-master-mergeBrian Paul2009-02-102-31/+66
| |\
| | * mesa: fixes for srgb formatsRoland Scheidegger2009-02-091-20/+14
| | | | | | | | | | | | | | | swizzling in fetch/store srgba/sargb functions fixed (consistent with equivalent non-srgb formats now).
| | * fix _mesa_get_teximage for srgb texturesRoland Scheidegger2009-02-091-11/+52
| | |
| * | mesa: merge gallium-0.2 into gallium-master-mergeBrian Paul2009-02-0933-196/+827
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'origin/gallium-0.2' into gallium-master-merge Conflicts: Makefile docs/relnotes-7.4.html docs/relnotes.html src/mesa/drivers/dri/i965/brw_wm.h src/mesa/main/imports.c src/mesa/main/mtypes.h src/mesa/main/texcompress.c src/mesa/main/texenvprogram.c src/mesa/main/version.h src/mesa/vbo/vbo_exec_api.c src/mesa/vbo/vbo_save_draw.c
| | * mesa: set version to 7.4 for mesa_7_4_branchBrian Paul2009-01-291-3/+3
| | |
| | * mesa: set version to 7.3Brian Paul2009-01-291-1/+1
| | |
| | * Merge commit 'origin/master' into gallium-0.2Alan Hourihane2009-01-2210-7/+237
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: windows/VC8/mesa/osmesa/osmesa.vcproj windows/VC8/progs/demos/gears.vcproj windows/VC8/progs/progs.sln
| | * \ Merge commit 'origin/master' into gallium-0.2Alan Hourihane2009-01-161-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/shader/slang/slang_compile.c
| | * | | mesa: check frambuffer complete status before renderingAlan Hourihane2009-01-151-13/+20
| | | | |
| | * | | Merge commit 'origin/master' into gallium-0.2Alan Hourihane2009-01-143-5/+14
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | mesa: set version string to 7.3-rc1Brian Paul2009-01-091-1/+1
| | | | | |
| | * | | | mesa: Remove _Active and _UseTexEnvProgram flags from fragment programs.Eric Anholt2009-01-093-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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]>
| | * | | | mesa: Add _mesa_snprintf.José Fonseca2009-01-082-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | On Windows snprintf is renamed as _snprintf.
| | * | | | mesa: fix GL_DEPTH_CLEAR_VALUE castingBrian Paul2009-01-082-4/+4
| | | | | |
| | * | | | mesa: fix float->int mapping for glGetIntegerv(GL_DEPTH_CLEAR_VALUE)Brian Paul2009-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 8124faf89d638285d8e9aa93adc3ca7f4ee729f3) Conflicts: src/mesa/main/get.c
| | * | | | mesa: Use explicit casts when precision is lost.José Fonseca2009-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Silences MSVC.
| | * | | | mesa: Fix windows build when UNICODE is defined.José Fonseca2009-01-081-1/+1
| | | | | |
| | * | | | Merge commit 'origin/master' into gallium-0.2Brian Paul2009-01-065-5/+60
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/common/dri_util.c
| | * \ \ \ \ Merge commit 'origin/master' into gallium-0.2Brian Paul2009-01-0212-143/+210
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/ffvertex_prog.c src/mesa/main/texenvprogram.c
| | * \ \ \ \ \ Merge commit 'origin/master' into gallium-0.2Brian Paul2008-12-301-2/+2
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/config.h
| | * | | | | | | mesa: Do not specify types in bitfields.José Fonseca2008-12-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As advised by gcc -pedantic.
| | * | | | | | | Merge commit 'origin/master' into gallium-0.2Brian Paul2008-12-192-24/+447
| | |\ \ \ \ \ \ \
| | * | | | | | | | mesa: remove unneeded _mesa_reference_fragprog() callBrian Paul2008-12-181-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The subsequent if/else cases always call _mesa_reference_fragprog() anyway.
| | * | | | | | | | mesa: updated commentsBrian Paul2008-12-181-10/+12
| | | | | | | | | |
| | * | | | | | | | 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 8dc88cb64305c591dfadded2b5acbb1e6b04cd7f. This change broke other things...
| | * | | | | | | | 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.
| | * | | | | | | | Merge commit 'origin/master' into gallium-0.2Brian Paul2008-12-164-72/+146
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge commit 'origin/master' into gallium-0.2Alan Hourihane2008-12-151-0/+12
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | mesa: fixes for srgb, new srgb formatsRoland Scheidegger2008-12-127-54/+358
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add some more srgb texture formats, including compressed ones various fixes relating to srgb formats issues: _mesa_get_teximage is completely broken for srgb textures, both for non-compressed ones (swizzling) and compressed ones (shouldn't do standard-to-linear conversion) texelFetch function may be broken for little or big endian (or both...)
| | * | | | | | | | | | Merge commit 'origin/master' into gallium-0.2Alan Hourihane2008-12-091-2/+10
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge commit 'origin/master' into gallium-0.2Alan Hourihane2008-12-083-8/+11
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: progs/glsl/Makefile
| | * \ \ \ \ \ \ \ \ \ \ \ Merge commit 'origin/master' into gallium-0.2Brian Paul2008-11-242-0/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: progs/glsl/Makefile
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'origin/master' into gallium-0.2Alan Hourihane2008-11-203-3/+16
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | mesa: fix generation of fixed function state when no vp existsAlan Hourihane2008-11-131-43/+41
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge commit 'origin/master' into gallium-0.2Brian Paul2008-11-118-30/+52
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/shader/prog_execute.c src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 02:46:28 +0000