summaryrefslogtreecommitdiffstats
path: root/src/mesa
Commit message (Collapse)AuthorAgeFilesLines
* i915: Update and translate the fragment program along with state updates.Eric Anholt2009-10-014-14/+26
| | | | | | | Previously, we were doing it in the midst of the pipeline run, which gave an opportunity to enable/disable fallbacks, which is certainly the wrong time to be doing so. This manifested itself in a NULL dereference for PutRow after transitioning out of a fallback during a run_pipeline in glean glsl1.
* Revert "i915: don't validate PS program when falling back to software"Eric Anholt2009-10-011-2/+1
| | | | | | | This reverts commit e7044d552c6d16389447880b8744a51de1cf0199. It prevented the driver from ever recovering from a software fallback due to a program error. The original bug it claimed to fix doesn't appear to exist post-revert.
* i915: Bail when the fragment program has too many total instructions.Eric Anholt2009-10-011-0/+10
| | | | Previously, we'd go trashing the heap.
* i915: Let i915_program_error take a format string, and don't use _mesa_problem.Eric Anholt2009-10-013-12/+24
| | | | | | It's misleading to report things like the program having too many native instructions as a Mesa implementation error, when the program may just be too big for the hardware.
* Merge branch 'mesa_7_6_branch'Brian Paul2009-10-0111-86/+172
|\
| * mesa: Return -FLT_MAX instead of 0 for LG2(0).Vinson Lee2009-10-011-1/+1
| | | | | | | | | | lim x->0 log(x) = -inf so -FLT_MAX is a better approximation than 0 for LG2(0).
| * i965: Fix massive memory allocation for streaming texture usage.Eric Anholt2009-09-303-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | Once we've freed a miptree, we won't see any more state cache requests that would hit the things that pointed at it until we've let the miptree get released back into the BO cache to be reused. By leaving those surface state and binding table pointers that pointed at it around, we would end up with up to (500 * texture size) in memory uselessly consumed by the state cache. Bug #20057 Bug #23530
| * glsl: regenerated fileBrian Paul2009-09-291-49/+57
| |
| * glsl: rewrite sqrt(x) intrinsic to handle x=0Brian Paul2009-09-291-34/+42
| | | | | | | | | | | | Since sqrt() is basically implemented in terms of RSQ/RCP we'll do a divide by zero if x=0 and wind up with unpredictable results. Now use CMP instruction to test for x<=0 and return zero in that case.
| * glsl: add support for CMP instructionBrian Paul2009-09-294-0/+4
| |
| * mesa/xlib: fix GLX_RENDER_TYPE queryBrian Paul2009-09-291-2/+2
| | | | | | | | Return GLX_RGBA_TYPE or GLX_COLOR_INDEX_TYPE.
* | mesa: better debug messageBrian Paul2009-10-011-1/+1
| |
* | gallium: remove depth.occlusion_count flagKeith Whitwell2009-10-011-4/+0
| | | | | | | | | | | | | | This was redundant as drivers can just keep track of whether they are inside a begin/end query pair. We want to add more query types later and also support nested queries, none of which map well onto a flag like this. No driver appeared to be using the flag.
* | st/mesa: fix non-mipmap lastLevel calculation.Cooper Yuan2009-10-011-1/+5
| | | | | | | | reviewed by Brian Paul.
* | mesa/main: New feature FEATURE_beginend.Chia-I Wu2009-09-3010-10/+184
| | | | | | | | | | This feature corresponds to the Begin/End paradigm. Disabling this feature also eliminates the use of GLvertexformat completely.
* | mesa/main: Make FEATURE_dlist follow feature conventions.Chia-I Wu2009-09-309-86/+110
| | | | | | | | | | As shown in mfeatures.h, this allows users of dlist.h to work without knowing if the feature is available.
* | mesa/main: Make FEATURE_evaluators follow feature conventions.Chia-I Wu2009-09-309-131/+114
| | | | | | | | | | As shown in mfeatures.h, this allows users of eval.h to work without knowing if the feature is available.
* | mesa/main: New feature FEATURE_queryobj.Chia-I Wu2009-09-309-75/+79
| | | | | | | | | | It merges FEATURE_ARB_occlusion_query and FEATURE_EXT_timer_query, and follows the feature conventions.
* | mesa/main: New feature FEATURE_arrayelt.Chia-I Wu2009-09-308-11/+73
| | | | | | | | This allows the removal of AEcontext.
* | mesa/main: Make FEATURE_texgen follow feature conventions.Chia-I Wu2009-09-303-37/+54
| | | | | | | | | | As shown in mfeatures.h, this allows users of texgen.h to work without knowing if the feature is available.
* | mesa/main: Make FEATURE_feedback follow feature conventions.Chia-I Wu2009-09-304-50/+70
| | | | | | | | | | As shown in mfeatures.h, this allows users of feedback.h to work without knowing if the feature is available.
* | mesa/main: Make FEATURE_drawpix follow feature conventions.Chia-I Wu2009-09-303-29/+42
| | | | | | | | | | As shown in mfeatures.h, this allows users of drawpix.h to work without knowing if the feature is available.
* | mesa/main: New feature FEATURE_rastpos.Chia-I Wu2009-09-305-254/+133
| | | | | | | | | | It is separated from FEATURE_drawpix and made to follow the feature conventions.
* | mesa/main: Make FEATURE_histogram follow feature conventions.Chia-I Wu2009-09-304-65/+47
| | | | | | | | | | As shown in mfeatures.h, this allows users of histogram.h to work without knowing if the feature is available.
* | mesa/main: Make FEATURE_attrib_stack follow feature conventions.Chia-I Wu2009-09-304-25/+47
| | | | | | | | | | As shown in mfeatures.h, this allows users of attrib.h to work without knowing if the feature is available.
* | mesa/main: Make FEATURE_accum follow feature conventions.Chia-I Wu2009-09-304-23/+45
| | | | | | | | | | As shown in mfeatures.h, this allows users of accum.h to work without knowing if the feature is available.
* | mesa: added nopfrag/nopvert options for MESA_GLSLBrian Paul2009-09-293-0/+16
| | | | | | | | | | These options can be used to force vertex/fragment shaders to be no-op shaders (actually, simple pass-through shaders). For debug/test purposes.
* | mesa: added _mesa_nop_vertex/fragment_program()Brian Paul2009-09-292-0/+98
| | | | | | | | For debug/test purposes.
* | Merge branch 'mesa_7_6_branch'Brian Paul2009-09-291-8/+14
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile configs/default docs/relnotes.html src/gallium/drivers/softpipe/sp_context.c src/gallium/drivers/softpipe/sp_tile_cache.c src/mesa/main/version.h
| * mesa: bump version to 7.6.1Brian Paul2009-09-291-3/+3
| |
| * mesa: work-around glXCopyContext() bug in _mesa_copy_texture_state()Brian Paul2009-09-291-8/+14
| | | | | | | | See bug 24217.
| * Prep for 7.6 releaseIan Romanick2009-09-281-1/+1
| |
* | r600: use CB_TARGET_MASK instead of CB_SHADER_MASK for setting color maskAndre Maasikas2009-09-291-3/+3
| | | | | | | | | | | | makes blend functions work better Signed-off-by: Dave Airlie <[email protected]>
* | r600: user correct alpha blend factorAndre Maasikas2009-09-291-2/+2
| | | | | | | | Signed-off-by: Dave Airlie <[email protected]>
* | r600: clear position enable bit when when wpos is not used by FPAndre Maasikas2009-09-291-0/+5
| | | | | | | | Makes doom3 alot nicer..
* | meta: Fix invalid PBO access from DrawPixels when trying to just alloc.Eric Anholt2009-09-281-6/+15
| | | | | | | | | | | | | | | | | | This whole reuse of buffers (TexSubImage instead of TexImage, SubData instead of Data) is bad for hardware drivers, but it's even worse when we accidentally try to access the 2x2 PBO to fill the new 16x16 texture we're creating, producing GL errors. Fixes piglit pbo-drawpixels. Bug #14163.
* | intel: Drop my generatemipmap code in favor of the new shared code.Eric Anholt2009-09-288-309/+1
| |
* | intel: Remove some dead metaops code.Eric Anholt2009-09-287-68/+2
| |
* | st/mesa: check gl_texture_object::GenerateMipmap field when allocating texmemBrian Paul2009-09-281-0/+3
| | | | | | | | | | In guess_and_alloc_texture() use the gl_texture_object::GenerateMipmap field as another hint as to whether to allocate space for a whole mipmap.
* | Merge branch 'mesa_7_6_branch'Brian Paul2009-09-284-56/+94
|\|
| * Merge branch 'mesa_7_5_branch' into mesa_7_6_branchBrian Paul2009-09-283-56/+93
| |\
| | * st/mesa: fix st_generate_mipmap() issuesBrian Paul2009-09-281-2/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | The main issue is we didn't always have a gallium texture object with enough space to store the to-be-generated mipmap levels. When that's the case, allocate a new gallium texture and use st_texure_finalize() to copy images from the old texture to the new one. We also had the baseLevel parameter to st_render_mipmap() wrong.
| | * st/mesa: fix/simplify st_texture_object::lastLevel calculationBrian Paul2009-09-281-53/+9
| | | | | | | | | | | | | | | | | | | | | Don't compute the st_texture_object::lastLevel field based on the texture filters. Use the _MaxLevel value that core Mesa computes for us. When called from the GenerateMipmap path, we'll use the lastLevel field as-is.
| | * i915: Fix GetBufferSubData in the case of a system-memory BO.mesa_7_5_2_rc1Eric Anholt2009-09-241-1/+4
| | | | | | | | | | | | Bug #23760 (crashes in wine)
| * | intel: Handle GL_RGB8 for glCopyTex(Sub)Image.Michel Dänzer2009-09-251-0/+1
| | | | | | | | | | | | Avoids an unnecessary fallback.
* | | mesa: use _mesa_get_current_tex_unit() helperBrian Paul2009-09-282-3/+4
| | |
* | | r600 : Enable draw_prim.Richard Li2009-09-271-2/+0
| | |
* | | Merge branch 'asm-shader-rework-2'Ian Romanick2009-09-2510-2124/+3025
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: src/mesa/shader/program_parse.tab.c
| * | | NV fp lexer: Add UP4B and UP4UB instructions that were previously missingIan Romanick2009-09-242-667/+686
| | | |
| * | | Merge branch 'master' into asm-shader-rework-2Ian Romanick2009-09-10173-8888/+13396
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/shader/lex.yy.c src/mesa/shader/program_parse.tab.c src/mesa/shader/program_parse.tab.h