summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'mesa_7_5_branch' into mesa_7_6_branchIan Romanick2009-09-161-0/+659
|\ | | | | | | | | Conflicts: src/mesa/main/dlist.c
| * mesa: compile glUniformMatrix() functions into display listsBrian Paul2009-09-151-0/+242
| | | | | | | | | | I believe this is the last of the shader-related functions that needed display list treatment.
| * mesa: implement more glUniform display list functionsBrian Paul2009-09-151-1/+365
| |
| * mesa: compile glUniform4f() into display listsBrian Paul2009-09-151-0/+26
| | | | | | | | Note: there are more glUniform functions to compile...
| * mesa: compile glUseProgram/glUseProgramObjectARB into display listsBrian Paul2009-09-151-0/+28
| | | | | | | | Fixes bug 23746
* | Merge branch 'mesa_7_5_branch' into mesa_7_6_branchBrian Paul2009-09-151-3/+3
|\|
| * mesa: raise GL_INVALID_ENUM not GL_INVALID_VALUE for glTexParamter errorsVinson Lee2009-09-111-3/+3
| | | | | | | | Signed-off-by: Brian Paul <[email protected]>
| * mesa: bump version to 7.5.2Brian Paul2009-09-081-3/+3
| | | | | | | | I'm not 100% sure there'll be a 7.5.2 release, but just in case.
| * mesa: added const qualifiers, move local varBrian Paul2009-08-311-7/+8
| |
| * mesa: fix saturation logic in emit_texenv()Brian Paul2009-08-311-1/+7
| | | | | | | | | | | | We need to clamp/saturate after each texenv stage, not just the last one. Fixes glean texEnv failure for softpipe (and probably other fragment program- based drivers).
* | mesa: in texenvprogram code, only do saturation when really needed.Brian Paul2009-09-101-8/+53
| | | | | | | | | | For some env modes (like modulate or replace) we don't have to clamp because we know the results will be in [0,1].
* | mesa: rename gl_sync_object::Status to StatusFlagBrian Paul2009-09-032-6/+6
| | | | | | | | | | There's a symbol collision with X11/Xlib.h #define Status int in the Mesa xlib code. This seems the simpliest way to work around this.
* | Don't dereference function pointers in calls.Ian Romanick2009-09-031-7/+7
| | | | | | | | | | | | I'm apparently alone in prefering this calling convention, so I'll be a team player. :p Based on review comments by Brian Paul and Eric Anholt.
* | Whitespace and include file clean-up.Ian Romanick2009-09-031-14/+0
| | | | | | | | Based on review comments by Brian Paul.
* | Use MIN2 instead of open-coded versionIan Romanick2009-09-031-1/+2
| | | | | | | | Based on review comments by Brian Paul.
* | ARB sync: Fix delete behavior and context destruction behaviorIan Romanick2009-09-034-24/+103
| | | | | | | | | | | | | | I believe this resolves the outstanding issues WRT sync object deletetion. I have also added a large comment at the top of syncobj.c describing the expected memory management behavior. I'm still a little uncertain about the locking on ctx->Shared.
* | Add dummy list node type 'struct simple_node'Ian Romanick2009-09-031-0/+5
| |
* | ARB sync: Add support for GL_ARB_sync to swrastIan Romanick2009-09-0310-0/+530
| | | | | | | | | | This isn't quite right yet. The delete behavior and the context clean-up needs some work.
* | ARB sync: Regenerate files from previous commitIan Romanick2009-09-031-3093/+3137
| |
* | ARB sync: Add infrastructure for glGetInteger64vIan Romanick2009-09-036-1/+1862
| |
* | mesa: fix typos in separable filter functionsBrian Paul2009-09-031-4/+4
| |
* | mesa: compute tex env program key size based on nr_enabled_unitsBrian Paul2009-09-031-8/+18
| | | | | | | | | | | | | | When no textures are enabled, the key size is 4 bytes. If unit[0] is enabled, the key size is 16 bytes. Inspired by a patch from Chris Wilson.
* | mesa: use new combined PBO validate/map helpers in convolution/filter funcsBrian Paul2009-09-031-66/+23
| |
* | mesa: use new combined PBO validate/map helpersBrian Paul2009-09-034-126/+43
| |
* | mesa: combined PBO validate/map helpersBrian Paul2009-09-032-0/+98
| |
* | mesa: use new _mesa_map_pbo_source/dest() functions in more placesBrian Paul2009-09-035-354/+192
| | | | | | | | | | This trims down the code a bit. The next step would be to combine the validate and map operations into one helper...
* | mesa: consolidate PBO map/unmap helpersBrian Paul2009-09-032-85/+41
| | | | | | | | | | | | | | Instead of _mesa_map_readpix_pbo() use _mesa_map_pbo_source(). Instead of _mesa_map_drawpix_pbo() and _mesa_map_bitmap_pbo() use _mesa_map_pbo_dest().
* | mesa: change ctx->Driver.BufferData() to return GLboolean for success/failureBrian Paul2009-09-032-11/+21
| | | | | | | | | | Return GL_FALSE if we failed to allocate the buffer. Then raise GL_OUT_OF_MEMORY in core Mesa.
* | Revert "mesa: fix the non-GNU C bit-field case"Brian Paul2009-09-021-2/+2
| | | | | | | | | | | | This reverts commit 4b08e7498230eac30eea1721f33994b30999acd4. Don't know what I was thinking there.
* | mesa: fix the non-GNU C bit-field caseBrian Paul2009-09-021-2/+2
| |
* | mesa: silence gcc bit-field warningGary Wong2009-09-021-2/+2
| |
* | mesa: replace 8 with NUM_UNITSBrian Paul2009-09-021-1/+4
| |
* | mesa: remove accidentally committed printfBrian Paul2009-09-021-1/+0
| |
* | mesa: added #ifdef __GNUC__ around GLubyte bitfield usageBrian Paul2009-09-021-0/+5
| | | | | | | | | | | | | | | | | | It would be nice if there were a #pragma or something to disable the warnings: main/texenvprogram.c:87: warning: type of bit-field ‘Source’ is a GCC extension main/texenvprogram.c:88: warning: type of bit-field ‘Operand’ is a GCC extension but there doesn't appear to be a way to do that.
* | mesa: Compact state key for TexEnv program cacheChris Wilson2009-09-021-3/+5
| | | | | | | | | | | | By rearranging the bitfields within the key we can reduce the size of the key from 644 to 196 bytes, reducing the cost of both the hashing and equality tests.
* | mesa: Make MultiDrawElements submit multiple primitives at once.Eric Anholt2009-09-018-33/+38
| | | | | | | | | | | | | | | | | | Previously, MultiDrawElements just called DrawElements a bunch of times. By sending several primitives down the pipeline at once, we avoid a bunch of validation. On my GL demo, this improves fps by 2.5% (+/- .41%) and reduces CPU usage by 70.5% (+/- 2.9%) (n=3). Reviewed by: Ian Romanick <[email protected]>
* | mesa: skip bitmap drawing code if width==0 or height==0Brian Paul2009-09-011-19/+22
| |
* | mesa: new _mesa_expand_bitmap() functionBrian Paul2009-09-012-0/+92
| |
* | mesa: remove redundant assignmentsBrian Paul2009-09-011-8/+1
| |
* | mesa: more clean-upsBrian Paul2009-09-011-24/+31
| |
* | mesa: change conditional to match the previous oneBrian Paul2009-09-011-1/+1
| |
* | mesa: updated #includesBrian Paul2009-09-011-2/+1
| |
* | mesa: remove unused texenv_fragment_program::ctx fieldBrian Paul2009-09-011-2/+0
| |
* | mesa: remove unused ureg::abs fieldBrian Paul2009-09-011-5/+2
| |
* | mesa: remove unused ureg:negateabs fieldBrian Paul2009-09-011-4/+1
| |
* | mesa: more comments, clean-upsBrian Paul2009-09-011-10/+10
| |
* | mesa: simplify translate_tex_src_bit()Brian Paul2009-09-011-20/+3
| |
* | mesa: minor code clean-ups, commentsBrian Paul2009-09-011-24/+34
| |
* | mesa: replace 8 with MAX_TEXTURE_UNITSBrian Paul2009-09-011-1/+1
| |
* | mesa: added _mesa_is_stencil_format()Brian Paul2009-08-312-0/+19
| |