aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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
| * | | | NV fp parser: Add support for condition codesIan Romanick2009-09-104-881/+1183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conditional write masks and the condition-code based KIL instruction are all supported. The specific behavior of KIL in the following shader may or may not match the behavior of other implementations: !!ARBfp1.0 TEMP GT; MOVC GT, fragment.texcoord[0]; KIL GT.x; END Should be it interpreted as 'KIL srcReg' or as 'KIL ccTest'? The current parser will interpret it as 'KIL srcReg'.
| * | | | ARB prog lexer: Add missing #include to silence compile warningIan Romanick2009-09-102-173/+175
| | | | |
| * | | | ARB prog parser: Differentiate between used and unused names in the lexerIan Romanick2009-09-105-834/+851
| | | | | | | | | | | | | | | | | | | | | | | | | The lexer will return IDENTIFIER only when the name does not have an associated symbol. Otherwise USED_IDENTIFIER is returned.
| * | | | NV fp parser: Support instruction and TEMP / OUTPUT sizesIan Romanick2009-09-046-1506/+1463
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds support for declaring TEMP and OUTPUT variables as 'LONG' or 'SHORT' precision. The precision specifiers are parsed, but they are currently ignored. Some support for this may be added in the future, but neither Intel hardware nor, as far as I'm aware, Radeon hardware support multiple precisions. Also adds support for instruction precision ('X', 'H', and 'R') suffixes and instruction condition code output ('C') suffix. This results in a fairly major change to the lexer. Instructions are matched with all the possible suffix strings. The suffix string are then carved off by a context (i.e., which program mode and options are set) aware parser that converts the suffixes to bits in prog_instruction. This could have been handled in the same way _SAT was originally handled in the lexer, but it would have resulted in a very large lexer with lots of opportunity for cut-and-paste errors.
| * | | | ARB prog parser: Add new constructor for asm_instructionIan Romanick2009-09-043-334/+400
| | | | | | | | | | | | | | | | | | | | | | | | | The new constructor copies fields from the prog_instruction that the parser expects the lexer to set.
| * | | | NV fp parser: Add support for absolute value operator on instruction operandsIan Romanick2009-09-032-840/+942
| | | | |
| * | | | Enable GL_NV_fragment_program_option for software renderingIan Romanick2009-09-032-0/+4
| | | | | | | | | | | | | | | | | | | | At this point the extension is not fully implemented.
| * | | | NV fp parser: Support new scalar constant behaviorIan Romanick2009-09-032-729/+770
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ARBfp requires scalar constants have a '.x' suffix, but NVfp_option does not. This shows up with instructions that require a scalar parameter (e.g., COS).
| * | | | NV fp parser: Parse TXD instructionIan Romanick2009-09-012-842/+941
| | | | |
| * | | | NV fp lexer: Add new opcodesIan Romanick2009-08-315-1191/+1455
| | | | |
| * | | | NV fp: Parse 'OPTION NV_fragment_program' in ARB assembly shadersIan Romanick2009-08-312-0/+12
| | | | |
| * | | | NV fp: Add tracking for NV_fragment_program_optionIan Romanick2009-08-312-0/+2
| | | | |
* | | | | radeon: Fix newlines.Michal Krol2009-09-251-14/+14
| | | | |
* | | | | Merge branch 'mesa_7_6_branch'Brian Paul2009-09-256-22/+13
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/intel/intel_clear.c
| * | | | mesa: move declaration before codeVinson Lee2009-09-251-2/+3
| | | | |
| * | | | intel: Flush the batch when we're about to subdata into a VBO.mesa_7_6_rc1Eric Anholt2009-09-242-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the clears in openarena with the new metaops clear code, and the new piglit vbo-subdata-sync test. Bug #23857.
| * | | | i965: Clean up some mess with the batch cache.Eric Anholt2009-09-243-18/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Its flagging of extra state that's already flagged by the vtbl new_batch when appropriate was confusing my tracking down of the OA clear bug.
* | | | | mesa/main: Make FEATURE_convolve follow feature conventions.Chia-I Wu2009-09-245-86/+103
| | | | | | | | | | | | | | | | | | | | | | | | | As shown in mfeatures.h, this allows users of convolve.h to work without knowing if the feature is available.
* | | | | mesa/main: Make FEATURE_colortable follow feature conventions.Chia-I Wu2009-09-246-74/+64
| | | | | | | | | | | | | | | | | | | | | | | | | As shown in mfeatures.h, this allows users of colortab.h to work without knowing if the feature is available.
* | | | | mesa/main: Make FEATURE_pixel_transfer follow feature conventions.Chia-I Wu2009-09-244-56/+51
| | | | | | | | | | | | | | | | | | | | | | | | | As shown in mfeatures.h, this allows users of pixel.h to work without knowing if the feature is available.
* | | | | mesa/main: Add comments to mfeatures.h.Chia-I Wu2009-09-241-0/+32
| | | | | | | | | | | | | | | | | | | | The comments document the conventions that a feature may follow.
* | | | | mesa: _mesa_meta_GenerateMipmap() now workingBrian Paul2009-09-241-33/+172
| | | | | | | | | | | | | | | | | | | | | | | | | Handles GL_TEXTURE_1D, GL_TEXTURE_2D, GL_TEXTURE_CUBE_MAP. But GL_TEXTURE_3D and texture borders not supported yet.
* | | | | mesa: remove: unused gl_vertex_program::TnlData fieldBrian Paul2009-09-242-8/+0
| | | | |
* | | | | Merge branch 'mesa_7_6_branch'Brian Paul2009-09-2412-28/+169
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/vbo/vbo_exec_array.c
| * | | | Merge branch 'mesa_7_5_branch' into mesa_7_6_branchBrian Paul2009-09-241-6/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | mesa: remove glEnable(GL_DEPTH_BOUNDS_TEST_EXT) check/warningBrian Paul2009-09-241-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | At the time of the enable there may not be a Z buffer, but one may be attached to the FBO later.