summaryrefslogtreecommitdiffstats
path: root/src/mesa
Commit message (Collapse)AuthorAgeFilesLines
* dri: remove unused files present only on gallium-0.2 branchKeith Whitwell2008-09-262-638/+0
|
* Merge commit 'origin/master' into HEADKeith Whitwell2008-09-2610-33/+53
|\ | | | | | | | | | | | | | | Conflicts: src/mesa/vbo/vbo.h src/mesa/vbo/vbo_exec_api.c src/mesa/vbo/vbo_exec_draw.c
| * mesa: fix cast/conversion for optional codeBrian2008-09-252-5/+7
| |
| * mesa: fix typo (s/feadback/feedback/). Fixes broken selection/feedback.Brian Paul2008-09-251-2/+2
| |
| * mesa: fix float->int mapping for glGetIntegerv(GL_DEPTH_CLEAR_VALUE)Brian Paul2008-09-252-3/+3
| |
| * mesa: fix some VBO buffer object issuesBrian Paul2008-09-252-11/+23
| | | | | | | | | | | | The VBO module may use a real VBO or a malloc'd buffer for vertex storage. Be careful not to accidentally replace the later with the former when drawing. Check if using a real VBO at destroy time to prevent a double-free.
| * mesa: fix function params to match prototypesSam Hocevar2008-09-251-5/+5
| |
| * mesa: prevent the slang code generator from aborting when faced with a ↵Sam Hocevar2008-09-251-1/+5
| | | | | | | | sampler variable redeclaration.
| * i965: support for sin() and cos() in vertex shaders.Sam Hocevar2008-09-251-0/+6
| |
| * i965: more meaningful message for unsupported opcodes.Sam Hocevar2008-09-252-3/+8
| |
| * intel: Fix clears to depth_stencil texture attachments.Eric Anholt2008-09-241-1/+1
| | | | | | | | | | | | Broken by 0adfd1021035e90995a25ec5f20b736e55075d92, showed up as an assertion failure in a software fallback in the shadowtex demo when we failed to recognize the texture format.
| * set SamplerUnit[] entry in load_texture() just to be safeBrian2008-09-241-0/+4
| | | | | | | | (cherry picked from commit fce4612f8a29ee1798c9326a431a139d856c7a04)
| * use PROGRAM_CONSTANT instead of PROGRAM_STATE_VAR when generating ↵Brian2008-09-241-1/+1
| | | | | | | | | | | | immediates/literals (cherry picked from commit fdc8636bdc65deb0d95a62a51c8d9bca05bc6bb8)
| * set program->SamplersUsed bit when using a texture instructionBrian2008-09-241-1/+4
| |
| * Remove ctx field from texenvprog_cacheBrian2008-09-241-4/+4
| |
| * include programopt.hBrian2008-09-241-0/+1
| | | | | | | | (cherry picked from commit 83fad68ec1989c719646a76f4cc5e0b3d23537ed)
| * Disable vertex shader fog, compute fog in fragment shader.Brian2008-09-241-5/+11
| |
| * temporarily set the FRAG_BIT_FOGC bit in InputsRead when fog is enabledBrian2008-09-241-0/+1
| | | | | | | | (cherry picked from commit 63be96bdc7e9f388a5c49295bd7e150462fd003a)
| * mesa: fix main/ prefix in includeKeith Whitwell2008-09-231-1/+1
| |
| * vbo: unmap and remap immediate vbo before/after each draw.Keith Whitwell2008-09-231-0/+16
| | | | | | | | | | | | | | | | | | | | Also use BufferData(NULL) to get fresh storage and avoid synchronous operation where we would have to flush and wait for the fence after each draw because of the map. This will chew through a whole load of buffer space on small draws, so it isn't a proper solution. Need to support a no-fence or append mapping mode to do this right, or use user buffers.
| * added vbo_use_buffer_objects() to specify that immediate mode data should be ↵Brian2008-09-233-2/+51
| | | | | | | | put into bufferobjects
| * vbo: seed initial max_element value with a more likely candidateKeith Whitwell2008-09-231-6/+6
| | | | | | | | (cherry picked from commit 026e7731e549e0777c010348460fd48b3d75a843)
| * mesa: s/GL_POLYGON+1/PRIM_OUTSIDE_BEGIN_END/Brian Paul2008-09-232-6/+6
| | | | | | | | (cherry picked from commit 8a369b909a6648ae7a5a0c2dcb972a2f96f99a80)
| * mesa: glsl: fix glGetUniform for matrix queriesBrian Paul2008-09-231-50/+79
| | | | | | | | (cherry picked from commit 7a6eba54d064cadf15f93df2c1748cf5e474ef03)
| * mesa: glsl: fix a number of glUniform issuesBrian Paul2008-09-231-31/+199
| | | | | | | | | | | | | | | | | | Additional error checking. Allow setting elements of uniform arrays. This involves encoding both a uniform location and a parameter offset in the value returned by glGetUniformLocation(). Limit glUniform[if]v()'s count to the size of the uniform array. When setting bool-valued uniforms, convert all float/int values to 0 or 1.
| * mesa: glsl: fix error check in get_uniformfv()Brian Paul2008-09-231-4/+9
| | | | | | | | (cherry picked from commit 18cd9c229a1fc8da8b7669b8d1d100f6bbeca183)
* | Merge commit 'origin/master' into gallium-0.2Keith Whitwell2008-09-231-2/+2
|\| | | | | | | | | | | | | | | Conflicts: src/mesa/main/drawpix.c src/mesa/shader/prog_uniform.c src/mesa/shader/slang/slang_link.c
| * mesa: Apply MSVC portability fixes from Alan Hourihane.José Fonseca2008-09-2316-67/+25
| |
| * mesa: update program->NumAddressRegs field in _slang_update_inputs_outputs()Brian Paul2008-09-231-0/+9
| |
| * mesa: add fwd decl of fill_in_entrypoint_offset()Brian Paul2008-09-231-0/+4
| | | | | | | | (cherry picked from commit b1eff0228b7199920c02e62446ebf5496c298814)
* | Merge commit 'origin/master' into gallium-0.2Keith Whitwell2008-09-236-12/+16
|\| | | | | | | | | | | | | | | Conflicts: src/mesa/glapi/glapi_getproc.c src/mesa/main/image.c src/mesa/shader/slang/slang_link.c
| * mesa: new gl_fragment_program fields indicating use of fog, front-facing, ↵Brian Paul2008-09-232-19/+36
| | | | | | | | | | | | point coord (cherry picked from commit d7a7b0a10dd355fbeb7a404091a42d4ab558c820)
| * Added new _mesa_clip_copytexsubimage() function to do avoid clipping down in ↵Brian2008-09-233-7/+60
| | | | | | | | | | | | | | the drivers. This should probably be pulled into main-line Mesa... (cherry picked from commit 324ecadbfdf9b944e059832f146451e4151dcb21)
| * mesa: refactor: move GetProcAddress code from glapi.c into new ↵Brian Paul2008-09-234-624/+656
| | | | | | | | glapi_getproc.c file
| * i965: Cope with batch getting flushed in the middle of batchbuffer emits.Eric Anholt2008-09-235-12/+14
| | | | | | | | | | | | | | | | | | This isn't required for GEM (at least, yet), but the check_aperture code for non-GEM results in batch getting flushed during emit. brw_state_upload restarts state emits, but a bunch of the state emit functions were assuming that they would be called exactly once, after prepare and before new_batch. Bug #17179.
| * intel: Add missing include files for meta drawpixels since mesa shuffling.Eric Anholt2008-09-231-0/+2
| |
* | Merge commit 'origin/master' into gallium-0.2Keith Whitwell2008-09-234-298/+142
|\|
| * intel: Replace pbo-only drawpixels function with a generic Mesa metaops.Eric Anholt2008-09-231-276/+108
| | | | | | | | Improves performance of some oglconform regression tests 9x.
| * i915: Fix overlapping CopyPixels with negative pixel zoom.Eric Anholt2008-09-231-4/+14
| | | | | | | | Fixes a failure in pixel-pos.c oglconform test.
| * i915: fix crash in flush_prim -> wait_flips -> flush_batch -> flush_prim.Eric Anholt2008-09-231-17/+18
| |
| * i965: Adapt to new TNL program tracking semanticsIan Romanick2008-09-221-1/+2
| | | | | | | | This fixes bugzilla #17718.
| * r300: Adapt to the removal of _tnl_ProgramCacheInit() and friends.Michel Dänzer2008-09-221-2/+1
| |
| * Remove incorrect test from mmAllocMem.Michel Dänzer2008-09-221-1/+1
| | | | | | | | | | 0 is a perfectly valid alignment shift, see e.g. driTexturesGone() which was broken by this.
* | remove leftover merge conflict markersKeith Whitwell2008-09-231-4/+0
| |
* | r300: Adapt to the removal of _tnl_ProgramCacheInit() and friends.Michel Dänzer2008-09-221-2/+1
| |
* | Remove incorrect test from mmAllocMem.Michel Dänzer2008-09-221-1/+1
| | | | | | | | | | 0 is a perfectly valid alignment shift, see e.g. driTexturesGone() which was broken by this.
* | mesa: Remove left over merge conflictsJakob Bornecrantz2008-09-221-3/+0
| |
* | Merge branch 'master' into gallium-0.2Keith Whitwell2008-09-2116-89/+101
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/glapi/glapi.h src/mesa/main/api_exec.c src/mesa/main/attrib.c src/mesa/main/clear.c src/mesa/main/context.c src/mesa/main/mfeatures.h src/mesa/main/mipmap.c src/mesa/main/mipmap.h src/mesa/main/readpix.c src/mesa/main/sources src/mesa/main/state.c src/mesa/main/texformat.c src/mesa/main/texparam.c src/mesa/main/texstate.c src/mesa/vbo/vbo_context.c src/mesa/x86/common_x86_asm.S
| * mesa: allow for extra per-context initBrian Paul2008-09-213-4/+7
| | | | | | | | (cherry picked from commit 815cdcfbc0740c66b901361620c88d99541bdad2)
| * mesa: texture crop rect stateBrian Paul2008-09-213-1/+35
| | | | | | | | (cherry picked from commit c01fbc7866d7cd5cf4263dffec6d9591470b4c23)