summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-11-06Merge branch 'mesa_7_6_branch'Ian Romanick
This should fix the memory leaks in the assembly parser without the regressions. The conflicts in program_lexer.l were related to changes in returning strings between the branches (always return IDENTIFIER vs. returing either IDENTIFIER or USED_IDENTIFIER). The conflicts in program_parse.y were related to two changes in master One change prints a variable name in an error message. The other change adds outputVarSize to the OUTPUT_statement rule. The cause the position of the IDENTIFIER to change from $2 to $3. Conflicts: src/mesa/shader/lex.yy.c src/mesa/shader/program_lexer.l src/mesa/shader/program_parse.tab.c src/mesa/shader/program_parse.y
2009-11-06ARB prog parser: Regenerate parser from previous commits.Ian Romanick
2009-11-06ARB prog parser: Release old program string in ↵Ian Romanick
_mesa_parse_arb_{fragment,vertex}_program The program structure passed to _mesa_parse_arb_program is just a place holder. The stings that actually need to be released are only known to the functions calling _mesa_parse_arb_program, so they should be freed there.
2009-11-06ARB prog parser: Release strings returned from the lexer that don't need to ↵Ian Romanick
be kept
2009-11-06Revert "ARB prog parser: Fix epic memory leak in lexer / parser interface"Ian Romanick
This reverts commit 93dae6761bc90bbd43b450d2673620ec189b2c7a. This change was completely broken when the parser uses multiple strings in a single production. It would be nice if bug fixes could initially land somewhere other than the stable branch.
2009-11-06llvmpipe: Fix build with llvm 2.6.José Fonseca
Fixes bug 24949.
2009-11-06intel: call intel_check_front_buffer_rendering() in intelClear()Brian Paul
fixes bug 24953.
2009-11-06mesa: Export S3_s3tc as well.José Fonseca
Used in Quake3.
2009-11-06mesa: Translate MAP_UNSYNCHRONIZED_BIT.José Fonseca
2009-11-06gallium: Add UNSYNCHRONIZED cpu access flag. Document others.José Fonseca
2009-11-06st/xorg: unify vertex buffer handlingZack Rusin
first step on our way to batching
2009-11-05xmesa: pass pixmap to clip_for_xgetimage()Brian Paul
The code was assuming ctx->DrawBuffer == ctx->ReadBuffer. Passing the pixmap is simpler and better. Fixes a potential segfault.
2009-11-05mesa: fix infinite loop bug in _mesa_drawbuffers()Brian Paul
Fixes bug 24946. This regression came from 8df699b3bb1aa05b633f05b121d09d812c86a22d.
2009-11-05softpipe: Implement PIPE_BLENDFACTOR_SRC_ALPHA_SATURATE for destination.José Fonseca
It is a valid and tested combination on D3D9.
2009-11-05g3dvl: remove a debug lineCooper Yuan
2009-11-05g3dvl: add scissor settingCooper Yuan
2009-11-04r300g: add polygon modeMarek Olšák
Signed-off-by: Corbin Simpson <MostAwesomeDude@gmail.com>
2009-11-04r300g: fix the size of CS when emitting the fragprog constant bufferMarek Olšák
Signed-off-by: Corbin Simpson <MostAwesomeDude@gmail.com>
2009-11-04r300g: set the correct offset in a colorbuffer surfaceMarek Olšák
Suggested by Joakim Sindholt. Also, put flushing of colorbuffers _before_ the framebuffer state setup, suggested by docs. Signed-off-by: Corbin Simpson <MostAwesomeDude@gmail.com>
2009-11-04r300g: add color channel maskingMarek Olšák
Signed-off-by: Corbin Simpson <MostAwesomeDude@gmail.com>
2009-11-04mesa: added cast to silence warningBrian Paul
2009-11-04Merge branch 'mesa_7_6_branch'Brian Paul
Conflicts: src/mesa/drivers/windows/gdi/mesa.def
2009-11-04vbo: fix out-of-bounds array accessBrian Paul
The exec->vtx.inputs[] array was being written past its end. This was clobbering the following vbo_exec_context::eval state. Probably not noticed since evaluators and immediate mode rendering don't happen at the same time. Fixed the loop in vbo_exec_vtx_init(). Changed the size of the vbo_exec_context::vtx.arrays[] array. Added a bunch of debug-build assertions. Issue found by Vinson Lee.
2009-11-04mesa: fix broken pack_histogram() case for GLhalfBrian Paul
2009-11-04mesa: silence warning from gcc 4.4.1Brian Paul
2009-11-04ARB prog parser: include variable name in error textBrian Paul
2009-11-04st/xorg: these flushes shouldn't be necessaryZack Rusin
performance optimization
2009-11-04progs/tests: Fix MSVC build.Vinson Lee
Signed-off-by: Brian Paul <brianp@vmware.com>
2009-11-04r600: rework draw functionsAlex Deucher
Seems INDX_OFFSET doesn't work properly on some cards, so change back to immediate mode indices. Seems to only affect DRI1. Needs more investigation. Rework and clean up the draw functions. Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
2009-11-04r600: fix count prediction for IB caseAlex Deucher
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
2009-11-04Fix YTILE spantmp functionsAlan Hourihane
2009-11-04Fix YTILE spantmp functionsAlan Hourihane
2009-11-04glslcompiler: Fix Mac OS build.Vinson Lee
Signed-off-by: Brian Paul <brianp@vmware.com>
2009-11-04util: Remove homegrown Windows KM profiler.José Fonseca
It's not sampling based so its results are biased towards functions called many times.
2009-11-04tgsi/ureg: Allow for multiple extended instruction tokens.Michal Krol
For example, we would like to have a predicate and texture token in one instruction to do predicated texture sampling.
2009-11-04nv50: fix shader emit_tex for cube texturesChristoph Bumiller
2009-11-04nv50: add abs-modifier for emit_minmaxChristoph Bumiller
2009-11-04nv50: add 3d texture tiling and mip-mappingChristoph Bumiller
Mip-mapped 3D textures are not arrays of 2D layers with a mip-map layout like 2D textures, therefore we cannot use image_nr == depth for them. Making use of "volume tiling" modes now, the allowed modes are 0xZY where Z <= 5 and y <= 5.
2009-11-03mesa: (GLint64) casts in get.c to silence Visual Studio warningsBrian Paul
Revised version of a patch from Karl Schultz.
2009-11-03docs: fix 7.6 build with Visual StudioBrian Paul
2009-11-03windows: updated VC8 project fileKarl Schultz
Signed-off-by: Brian Paul <brianp@vmware.com>
2009-11-03windows: remove old entrypoints from mesa.def fileKarl Schultz
Signed-off-by: Brian Paul <brianp@vmware.com>
2009-11-03mesa: added GLAPIENTRY keywords for sync object functionsKarl Schultz
Signed-off-by: Brian Paul <brianp@vmware.com>
2009-11-03progs/util: Fix memory leak if fail to load/compile shaderVinson Lee
Signed-off-by: Brian Paul <brianp@vmware.com>
2009-11-03llvmpipe: Sanitise shader semantic and interpolator handling.Michal Krol
Handle the remaining semantic names and indices. Respect color interpolator when not flatshading. Based on Michal's softpipe commit eb699d64ec7057032139baccedcb0694ca41d706.
2009-11-03llvmpipe: remove old prim_setup draw stageKeith Whitwell
Everything now goes through the draw_vbuf handler, the same as regular drivers. Based on Keith's commit 4fe0fc3eba1f79beda890a5016359d549bab6ad4.
2009-11-03llvmpipe: Respect gl_rasterization_rules in primitive setup.José Fonseca
Based on Michal's identical commit for softpipe (ca9c413647bf9efb5ed770e3a655bc758075aec7).
2009-11-03python/retrace: Cope with null constant buffers.José Fonseca
2009-11-03python/retrace: Add missing colon.José Fonseca
2009-11-03progs/tests: debug code for getting texture component sizesBrian Paul