Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge of glsl-compiler-1 branch | Brian | 2007-03-26 | 16 | -267/+1421 |
|\ | |||||
| * | Free shader-related context state: _mesa_free_shader_state() | Brian | 2007-03-24 | 1 | -0/+1 |
| | | |||||
| * | Add the ability to generate programs that doesn't use condition codes. | Brian | 2007-03-23 | 1 | -2/+4 |
| | | | | | | | | | | | | | | ctx->Shader.EmitCondCodes determines if we use condition codes. If not, IF statement uses first operand's X component as the condition. Added OPCODE_BRK0, OPCODE_BRK1, OPCODE_CONT0, OPCODE_CONT1 to handle the common cases of conditional break/continue. | ||||
| * | merge from master | Brian | 2007-03-21 | 13 | -801/+705 |
| |\ | |||||
| * | | silently ignore DeleteProgram/Shader(id=0) | Brian | 2007-03-15 | 1 | -13/+19 |
| | | | |||||
| * | | in _mesa_GetColorTable, return silently if table size is 0 | Brian | 2007-03-15 | 1 | -2/+6 |
| | | | |||||
| * | | fix ctx->Pixel.PostConvolutionScale/Bias subscript bugs | Brian | 2007-03-13 | 1 | -6/+6 |
| | | | |||||
| * | | alloc an extra byte in _mesa_ShaderSourceARB() to silence a valgrind warning | Brian | 2007-03-13 | 1 | -4/+9 |
| | | | |||||
| * | | properly compute ctx->Texture._EnabledCoordUnits | Brian | 2007-03-13 | 1 | -12/+8 |
| | | | |||||
| * | | Implement support for GL_ARB_draw_buffers with GL_MAX_DRAW_BUFFERS > 1. | Brian | 2007-03-11 | 2 | -2/+3 |
| | | | | | | | | | | | | | | | | | | GL_MAX_DRAW_BUFFERS is currently 4. Added gl_FragData[] output for fragment programs. In _swrast_write_rgba_span() loop over the color outputs/renderbuffers. | ||||
| * | | Merge branch 'master' of git+ssh://[email protected]/git/mesa/mesa ↵ | Brian | 2007-03-10 | 1 | -1/+2 |
| |\ \ | | | | | | | | | | | | | into glsl-compiler-1 | ||||
| * | | | added GL_CURRENT_PROGRAM | Brian | 2007-03-09 | 2 | -1/+20 |
| | | | | |||||
| * | | | Merge branch 'origin' into glsl-compiler-1 | Brian | 2007-03-09 | 12 | -123/+171 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/context.c | ||||
| * | | | | use 2.0, 2.1 version strings | Brian | 2007-03-07 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | s/matrix_stack/gl_matrix_stack/ and s/mesa_list_state/gl_dlist_state/ | Brian | 2007-02-27 | 2 | -15/+15 |
| | | | | | |||||
| * | | | | remove unused DriverMgrCtx | Brian | 2007-02-26 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Add EmitHighLevelInstructions, EmitComments booleans to gl_shader_state. | Brian | 2007-02-26 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | These control code generation options. May be overridden by drivers, debuggers, etc. | ||||
| * | | | | fix mem leak in _mesa_ShaderSourceARB() | Brian | 2007-02-26 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | define and use MAX_PROGRAM_ADDRESS_REGS | Brian | 2007-02-25 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | s/GetFragmentProgramRegister/GetProgramRegister/ | Brian | 2007-02-25 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Undo some changes to _mesa_UpdateTexEnvProgram(). Fixes broken i915 texturing. | Brian | 2007-02-24 | 1 | -3/+9 |
| | | | | | |||||
| * | | | | Remove unneeded _Fragment/VertexShaderPresent fields, update comments. | Brian | 2007-02-24 | 1 | -7/+9 |
| | | | | | |||||
| * | | | | s/GLint/gl_state_index/, length is now 5 not 6 | Brian | 2007-02-23 | 1 | -9/+7 |
| | | | | | |||||
| * | | | | added MAX_PROGRAM_ENV_PARAMS | Brian | 2007-02-22 | 2 | -4/+5 |
| | | | | | |||||
| * | | | | Merge branch 'origin' into glsl-compiler-1 | Brian | 2007-02-22 | 32 | -567/+334 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/state.c src/mesa/shader/program.c src/mesa/shader/program.h src/mesa/shader/programopt.c src/mesa/shader/slang/slang_execute.c src/mesa/sources src/mesa/swrast/s_arbshader.c src/mesa/swrast/s_context.c src/mesa/swrast/s_span.c src/mesa/swrast/s_zoom.c src/mesa/tnl/t_context.c src/mesa/tnl/t_save_api.c src/mesa/tnl/t_vb_arbprogram.c src/mesa/tnl/t_vp_build.c src/mesa/tnl/t_vtx_eval.c | ||||
| * | | | | | Add _NEW_PROGRAM flag to _MESA_NEW_NEED_EYE_COORDS. | Brian | 2007-02-03 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a segfault in the texgen code that can occur after we've disabled a vertex program. | ||||
| * | | | | | added FRAG_BIT_TEX() and FRAG_BIT_VAR() macros | Brian | 2007-01-24 | 1 | -0/+4 |
| | | | | | | |||||
| * | | | | | fix g++ warnings/errors | Brian | 2007-01-23 | 1 | -2/+3 |
| | | | | | | |||||
| * | | | | | Implement vertex attribute binding. | Brian | 2007-01-09 | 1 | -5/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users can set explicit binding with glBindAttribLocation(), otherwise the linker will allocate generic attribute slots. | ||||
| * | | | | | Moved NumTexInstructions, NumTexIndirections, etc. into gl_program since | Brian | 2007-01-09 | 2 | -15/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | they can now apply to vertex programs. | ||||
| * | | | | | added PROGRAM_SAMPLER | Brian | 2007-01-05 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | move TexturesUsed[] into gl_program since vertex programs/shaders can use ↵ | Brian | 2007-01-04 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | textures nowadays | ||||
| * | | | | | simplify update_texture_state() a bit, compute _EnabledCoordUnits for shaders | Brian | 2007-01-04 | 1 | -16/+25 |
| | | | | | | |||||
| * | | | | | update_texture_state() updated for new shaders | Brian | 2007-01-04 | 1 | -29/+10 |
| | | | | | | |||||
| * | | | | | Minor clean-ups, reformatting, comment changes. | Brian | 2006-12-20 | 1 | -23/+24 |
| | | | | | | |||||
| * | | | | | Fix shader object reference counting and hash table deallocation. | Brian | 2006-12-20 | 3 | -23/+28 |
| | | | | | | |||||
| * | | | | | Clean-up and re-org of the main GLSL object types. | Brian | 2006-12-19 | 3 | -18/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the gl_shader struct as it should be. Renamed gl_linked_program to gl_shader_program. Store both shaders and programs in the same hash table and use the Type field to distinguish them. | ||||
| * | | | | | Overhaul of GLSL API functions, dispatching, etc. | Brian | 2006-12-19 | 5 | -20/+77 |
| | | | | | | |||||
| * | | | | | Massive re-org of GLSL-related API functions. | Brian | 2006-12-19 | 2 | -0/+908 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new GLSL functions to struct dd_function_table. main/shaders.c calls GLSL functions through the dd_function_table. shader/shader_api.c implements the API functions. Other assorted changes, fixes everywhere else. | ||||
| * | | | | | Lots of assorted changes for new GLSL compiler backend. | Brian | 2006-12-15 | 9 | -126/+265 |
| | | | | | | | | | | | | | | | | | | | | | | | | New datatypes, constants, variables. | ||||
| * | | | | | Modify _mesa_strdup() so it handles NULL correctly. | Brian | 2006-12-14 | 1 | -6/+14 |
| | | | | | | |||||
* | | | | | | Fix some renderbuffer reference counting issues. Also fixes a mem leak. | Brian | 2007-03-25 | 5 | -80/+55 |
| | | | | | | |||||
* | | | | | | Color3iv: set the alpha value to 1.0 | Xiang, Haihao | 2007-03-25 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Implement alpha buffer copy for SwapBuffers(). | Brian | 2007-03-23 | 2 | -0/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nicolai writes: When the pixmap pixel format has no alpha channel, the x11 driver (software rendering) adds a wrapped alpha channel on request. During SwapBuffers, this alpha channel is not copied from back to front, which means that the front buffer doesn't really contain the contents that the back buffer previously contained. A subsequent glReadPixels from the front buffer will return an incorrect result. The following patch attempts to fix this. | ||||
* | | | | | | use _mesa_copy_instructions() | Brian | 2007-03-22 | 1 | -4/+3 |
| | | | | | | |||||
* | | | | | | Ensure we have a valid ReadBuffer for CopyTexSubImage, and | Alan Hourihane | 2007-03-22 | 1 | -6/+6 |
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | if not bail accordingly. Previously we'd only do this test on compressed textures. | ||||
* | | | | | mesa: revert f9f79c8d770e696249bd98c68b563f887562c974 | Xiang, Haihao | 2007-03-21 | 3 | -16/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to fix #10232 Table6.1(in gl2.1) has been applied for glGetTexImage before calling into _mesa_pack_rgba_span_float. | ||||
* | | | | | mesa: SWAP_BUFF support when calling DrawPixels(DEPTH_COMPONENT) | Xiang, Haihao | 2007-03-18 | 1 | -53/+45 |
| | | | | | | | | | | | | | | | | | | | | or TexImage(DEPTH_COMPONENT) | ||||
* | | | | | mesa: enhance fxt1_quantize_ALPHA1 | Xiang, Haihao | 2007-03-18 | 1 | -33/+44 |
| | | | | | | | | | | | | | | | | | | | | If possible, let minCol != maxCol | ||||
* | | | | | fix some format conversion bugs in glGetTexImage(), bug 10288 | Haihao Xiang | 2007-03-17 | 1 | -0/+19 |
| | | | | |