Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | For _mesa_share_state(), update the context's references to the new share ↵ | Brian | 2007-08-23 | 1 | -0/+24 |
| | | | | group's objects (Shane Blackett) | ||||
* | Replace Proxy1D/2D/etc with ProxyTex[] indexed by TEXTURE_x_INDEX. | Brian | 2007-08-16 | 1 | -54/+27 |
| | | | | Simplification in colortab.c too. | ||||
* | Bring over the texobj refcounting changes from mesa_7_0_branch | Brian | 2007-08-16 | 1 | -17/+29 |
| | |||||
* | Implement mutex/locking around texture object reference counting. | Brian | 2007-08-13 | 1 | -57/+32 |
| | | | | | | Use new _mesa_reference_texobj() function for referencing/unreferencing textures. Add new assertions/tests to try to detect invalid usage of deleted textures. | ||||
* | Rework _mesa_update_texture_compare_function() to only be called during | Brian | 2007-06-11 | 1 | -40/+42 |
| | | | | | | | state validation/update. Note that we're still temporarily skipping the test for an active fragment program. Need to fix shadow2D() ... | ||||
* | rename/clean-up _mesa_validate_texture_wrap_mode | Brian | 2007-06-11 | 1 | -12/+15 |
| | |||||
* | fix typo, added comment | Brian | 2007-06-11 | 1 | -2/+5 |
| | |||||
* | Replace texobj->Complete with texobj->_Complete since it's a derived field. | Brian | 2007-06-11 | 1 | -3/+3 |
| | |||||
* | Add support for GL_ARB_fragment_program_shadow. | Ian Romanick | 2007-06-07 | 1 | -0/+2 |
| | |||||
* | Fix ARB_fp spec conformance bug WRT shadow sampling. | Ian Romanick | 2007-06-07 | 1 | -0/+35 |
| | | | | | The ARB_fp (and other assembly-level fragment program specs) say that the depth comparison function is always GL_NONE in fragment program mode. | ||||
* | Initial implementation of MESA_texture_array | Ian Romanick | 2007-05-16 | 1 | -0/+46 |
| | | | | | Shadow sampling from texture arrays is still not implemented. Everything else should be there, though. | ||||
* | Refactor queries of GL_(SOURCE|OPERAND)[012]_(ALPHA|RGB). | Ian Romanick | 2007-05-10 | 1 | -136/+16 |
| | | | | | | | | | Most switch-statements that have cases for these enums already use code like: const GLuint idx = pname - GL_SOURCE0_RGB; ... texUnit->Combine.SourceRGB[idx] ... This patch just brings the remaining bits up to speed. | ||||
* | Enable texture sampling for vertex programs/shaders. | Brian | 2007-04-17 | 1 | -7/+18 |
| | | | | | | | This is a bit of a hack for now because the tnl module is using the swrast module to fetch texels. The texture fetch/filter code should probably be moved into the main/ module since it doesn't really depend upon other swrast code. | ||||
* | illegal to set GL_TEXTURE_MAX_LEVEL w/ GL_TEXTURE_RECTANGLE_ARB | Brian | 2007-04-14 | 1 | -4/+8 |
| | |||||
* | properly compute ctx->Texture._EnabledCoordUnits | Brian | 2007-03-13 | 1 | -12/+8 |
| | |||||
* | move TexturesUsed[] into gl_program since vertex programs/shaders can use ↵ | Brian | 2007-01-04 | 1 | -1/+1 |
| | | | | 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 |
| | |||||
* | Overhaul of GLSL API functions, dispatching, etc. | Brian | 2006-12-19 | 1 | -1/+1 |
| | |||||
* | Lots of assorted changes for new GLSL compiler backend. | Brian | 2006-12-15 | 1 | -2/+11 |
| | | | | New datatypes, constants, variables. | ||||
* | Merge texmem-0-3-branch. | Keith Whitwell | 2006-11-01 | 1 | -50/+75 |
| | |||||
* | Clean-up FEATURE_ARB_shader_objects #ifdefs. Bug 7492. | Michal Krol | 2006-08-01 | 1 | -1/+9 |
| | |||||
* | Better caching for texenv programs. | Keith Whitwell | 2006-05-22 | 1 | -0/+2 |
| | | | | Initialize some values correctly. | ||||
* | use _mesa_compressed_texture_size() for GL_TEXTURE_COMPRESSED_IMAGE_SIZE query | Brian Paul | 2006-05-09 | 1 | -4/+12 |
| | |||||
* | Replace ctx->Const.MaxTextureUnits w/ ctx->Const.MaxTexture[Coord/Image]Units | Brian Paul | 2006-04-14 | 1 | -29/+114 |
| | | | | | | in various places. Note that ctx->Texture.CurrentUnit needs to be tested against Coord/Image limits when referenced, not just in glActiveTexture(). | ||||
* | Clean up the recent code related to texture_override(). Pass params in a | Brian Paul | 2006-03-24 | 1 | -45/+56 |
| | | | | | | | more logical order. Remove a mess of stray ^M chars. Fix a bug when checking if the texture object's format is GL_COLOR_INDEX or GL_DEPTH_COMPONENT. This fixes a segfault when GL_TEXTURE_BASE_LEVEL!=0. | ||||
* | GLSL fixes: | Michal Krol | 2006-03-21 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | - generate error on NULL pointers in glShaderSourceARB; - reinstall program object, if current, in glLinkProgramARB; - vertex and fragment shaders are optional in program object; - floor asm was wrongly computed for x86 back-end; - allow for (void) idiom in function prototypes; - all fixed-state uniforms are updated; - local variable initializers are working; - implement texture* and shadow* functions for vertex processor; - generate error if too many arguments in general constructor; - trim unused data in general constructor; - struct r-value field select was badly relocated; Changes: - add derived state gl_fog_attrib::_Scale; - add derived state gl_light::_CosCutoffNeg; | ||||
* | More GLSL code: | Michal Krol | 2006-03-14 | 1 | -63/+44 |
| | | | | | - add texture sampling support; - fix assembly codegen bugs; | ||||
* | Fix _mesa_copy_texture_state() so that we copy texture object bindings, | Brian Paul | 2006-02-24 | 1 | -12/+41 |
| | | | | | not the actual contents of texture objects. This makes glXCopyContext() work properly. | ||||
* | Enable texcoords when program object in use. | Michal Krol | 2006-02-15 | 1 | -2/+5 |
| | |||||
* | fix test for valid texunit in _mesa_ClientActiveTextureARB | Roland Scheidegger | 2006-02-01 | 1 | -1/+1 |
| | |||||
* | Removed the GL_SGIX/SGIS_pixel_texture extensions. Same thing can be | Brian Paul | 2005-12-14 | 1 | -132/+0 |
| | | | | done with fragment programs nowadays. | ||||
* | Move stuff common to vertex/fragment_program into the base class, including: | Brian Paul | 2005-11-12 | 1 | -1/+1 |
| | | | | | | Instructions, InputsRead, OutputsWritten, and Parameters. Also, added debug functions: _mesa_print_instruction(), _mesa_print_program_parameters() and revamp _mesa_print_program(). | ||||
* | Make _mesa_is_proxy_texture() non-static and use in a few more places. | Brian Paul | 2005-11-11 | 1 | -61/+24 |
| | | | | | Use COPY_4FV() where possible. Added some comments, clean-ups. | ||||
* | remove unneeded #includes | Brian Paul | 2005-11-05 | 1 | -3/+0 |
| | |||||
* | In gl_texture_image replace IntFormat with InternalFormat and Format with | Brian Paul | 2005-10-05 | 1 | -11/+12 |
| | | | | _BaseFormat to be consistant with gl_renderbuffer. | ||||
* | check for GL_DEPTH_STENCIL_EXT | Brian Paul | 2005-10-01 | 1 | -1/+2 |
| | |||||
* | Initial work for GL_EXT_packed_depth_stencil extension. | Brian Paul | 2005-09-28 | 1 | -0/+10 |
| | | | | glReadPixels done, glDrawPixels mostly done. | ||||
* | s/GL_DEPTH_BITS/GL_TEXTURE_DEPTH_SIZE_ARB/ in _mesa_GetTexLevelParameteriv() | Brian Paul | 2005-09-21 | 1 | -1/+1 |
| | |||||
* | Replace GLuint with GLbitfield where appropriate. Also replace GLuint | Brian Paul | 2005-09-15 | 1 | -5/+5 |
| | | | | with GLboolean in a few places. | ||||
* | check for either GL_ARB_depth_texture or GL_SGIX_depth_texture in a few places | Brian Paul | 2005-09-08 | 1 | -5/+3 |
| | |||||
* | In _mesa_TexEnvfv, do not accept values for GL_OPERAND2_ALPHA and ↵ | Roland Scheidegger | 2005-08-15 | 1 | -4/+24 |
| | | | | GL_OPERAND2_RGB which are only valid with ARB_texture_env_combine but not with EXT_texture_env_combine, when only EXT_texture_env_combine is supported. | ||||
* | Cache texenv programs to avoid repeated compilation (Ben Skeggs) | Keith Whitwell | 2005-07-11 | 1 | -0/+3 |
| | |||||
* | Add a set of predicate functions for testing matrices instead of directly | Brian Paul | 2005-06-30 | 1 | -5/+5 |
| | | | | | | testing the flags field. Move definition of all the MAT_FLAGs into the m_matrix.c file since they're now private. | ||||
* | clamp anisotropy against max value | Brian Paul | 2005-02-08 | 1 | -3/+5 |
| | |||||
* | fix tex env mode GL_BLEND for GL_INTENSITY texture formats | Roland Scheidegger | 2004-06-17 | 1 | -0/+2 |
| | |||||
* | fix some minor glitches in glGetTexParameter code | Brian Paul | 2004-06-11 | 1 | -7/+7 |
| | |||||
* | Don't call calculate_derived_texenv() from in _mesa_TexEnv(). | Brian Paul | 2004-05-10 | 1 | -32/+18 |
| | | | | Minor code rearranging. | ||||
* | Added ctx->Vertex/FragmentProgram._Enable flags. Set when vertex/fragment | Brian Paul | 2004-04-23 | 1 | -2/+2 |
| | | | | | | | program is enabled AND the currently bound program is valid. Check _Enable instead of Enable to prevent things from blowing up when someone calls glEnable(GL_VERTEX_PROGRAM_ARB) without actually defining a program. | ||||
* | New glTexImage code. | Brian Paul | 2004-04-22 | 1 | -1/+65 |
| | | | | | | | | The gl_texture_format struct now has a StoreTexImageFunc that's called by glTex[Sub]Image[123]D to convert the user's texture data into the specific texture format layout. Now it's much easier to add new texture formats (like the 16/32-bit floating point formats). The texutil.[ch] and texutil_tmp.h files are obsolete. |