summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
Commit message (Collapse)AuthorAgeFilesLines
* mesa: check for ARB_framebuffer_object for GL_TEXTURE_STENCIL_SIZE_EXT queryBrian Paul2009-06-291-1/+2
|
* Merge branch 'arb_vertex_array_object'Brian Paul2009-06-2610-202/+301
|\
| * mesa: plug in glBindVertexArray, glGenVertexArrays functionsBrian Paul2009-06-221-0/+4
| |
| * mesa: enforce the rule that arrays live in VBOs for GL_ARB_vertex_array_objectBrian Paul2009-06-221-25/+52
| |
| * mesa: added extension flag for ARB_vertex_array_objectBrian Paul2009-06-222-0/+3
| |
| * mesa: implement _mesa_GenVertexArrays() for GL_ARB_vertex_array_objectBrian Paul2009-06-193-4/+32
| | | | | | | | | | | | This also involves adding a gl_array_object::VBOonly field. For the ARB extension, all arrays in the object must reside in a VBO. This flag keeps track of that requirement.
| * mesa: implement _mesa_BindVertexArray()Brian Paul2009-06-192-12/+46
| |
| * mesa: move vertex array objects from shared state to per-contextBrian Paul2009-06-196-41/+42
| | | | | | | | | | The ARB version requires VAOs to be per-context while the Apple extension was ambiguous.
| * mesa: regenerated files related to GL_ARB_vertex_array_objectBrian Paul2009-06-191-121/+123
| |
* | Merge branch 'mesa_7_5_branch'Brian Paul2009-06-261-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile src/gallium/drivers/softpipe/sp_screen.c src/mesa/main/version.h
| * | mesa: raise MAX_VARYING (number of shader varying vars) to 16Brian Paul2009-06-261-1/+1
| | | | | | | | | | | | | | | | | | 16 is the limit for now because of various 32-bit bitfields. (cherry picked from master, commit 4e762395ef7e8c332c16fd0c11025cfa52763a45)
| * | mesa: bump version to 7.5-rc4Brian Paul2009-06-261-1/+1
| | |
| * | glsl: Added gl_shader_state::EmitContReturn fieldBrian Paul2009-06-261-0/+1
| | | | | | | | | | | | | | | | | | | | | This is the start of a glsl-continue-return feature branch to support a GLSL code generator option for 'continue' and 'return' statements. Some targets don't support CONT or RET statements so we'll need to try to generate code that does not use them...
* | | Merge branch 'mesa_7_5_branch'Brian Paul2009-06-247-19/+40
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/i915/i915_tex_layout.c src/mesa/drivers/dri/i965/brw_wm_glsl.c src/mesa/drivers/dri/intel/intel_buffer_objects.c src/mesa/drivers/dri/intel/intel_pixel_bitmap.c src/mesa/drivers/dri/intel/intel_pixel_draw.c src/mesa/main/enums.c src/mesa/main/texstate.c src/mesa/vbo/vbo_exec_array.c
| * | mesa: s/MAX_VERTEX_PROGRAM_ATTRIBS/MAX_NV_VERTEX_PROGRAM_INPUTS/ in NV funcsBrian Paul2009-06-221-8/+8
| | | | | | | | | | | | (cherry picked from commit 4dc426c01627a240bd5b148c1804c45b0d5ecd6c)
| * | mesa: rename MAX_VERTEX_ATTRIBS to MAX_VERTEX_GENERIC_ATTRIBSBrian Paul2009-06-224-26/+26
| | | | | | | | | | | | | | | | | | Be clearer that this is the number of generic vertex program/shader attributes, not counting the legacy attributes (pos, normal, color, etc). (cherry picked from commit 4a95185c9f30c2de7a03bb1a0653f51b53b1111d)
| * | mesa: s/MAX_VERTEX_PROGRAM_ATTRIBS/MAX_NV_VERTEX_PROGRAM_INPUTSBrian Paul2009-06-221-1/+1
| | | | | | | | | | | | (cherry picked from commit d2a74d76c96957cf0294dcf40d29526621ada95e)
| * | mesa: fix some potential state-restore issues in pop_texture_group()Brian Paul2009-06-221-45/+45
| | | | | | | | | | | | | | | | | | | | | Call the _mesa_set_enable() functions instead of driver functions, etc. Also, add missing code for 1D/2D texture arrays. (cherry picked from commit aac19609bfd7c950b2577489b06886c8a8097bb2)
| * | mesa: create/use a fallback texture when bound texture is incompleteBrian Paul2009-06-224-2/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a GLSL sampler reads from an incomplete texture it should return (0,0,0,1). Instead of jumping through hoops in all the drivers to make this happen, just create/install a fallback texture with those texel values. Fixes piglit/fp-incomplete-tex on i965 and more importantly, fixes some GPU lockups when trying to sample from missing surfaces. If a binding table entry is NULL, it seems that sampling sometimes works, but not always (lockup). Todo: create a fallback texture for each type of texture target? (cherry picked from commit 3f25219c7bf0f090502489928f0f018e62c4f6cf)
| * | Always free image offsets memory when re-initializing texture image fields.Michel Dänzer2009-06-192-3/+2
| | | | | | | | | | | | Fixes leak running compiz with direct rendering.
| * | mesa: protect Elements against multiple definitionsKeith Whitwell2009-06-181-2/+2
| | | | | | | | | | | | Mesa and gallium both have a definition of this macro
| * | Fast path when rebinding the same texture in single context environmentIan Romanick2009-06-171-0/+12
| | | | | | | | | | | | | | | | | | If there is no shared context, there is no purpose in rebinding the same texture. In some artificial tests this improves performance 10% - 30%. (cherry picked from commit 7f8000db8bd45bb95bda4a4f8535c49b8ef74254)
| * | mesa: Mark FBOs with compressed color attachments as FBO-incomplete.Eric Anholt2009-06-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Both EXT_fbo and ARB_fbo agree on this. Fixes a segfault in the metaops mipmap generation in Intel for SGIS_generate_mipmap of S3TC textures in Regnum Online. Bug #21654. (cherry picked from commit 0307e609aa3e707eeb40051bd664d36f2340ba9b)
| * | mesa: rework viewport/scissor initialization codeBrian Paul2009-06-173-12/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first time a context is bound to a drawable, the viewport and scissor bounds are initialized to the buffer's size. This is actually a bit tricky. A new _mesa_check_init_viewport() function is called in several places to check if the viewport has been initialized. We also use a new ctx->ViewportInitialized flag instead of the overloaded ctx->FirstTimeCurrent flag.
* | | mesa: From float type modifier from values to large for singlesIan Romanick2009-06-221-7/+7
| |/ |/| | | | | | | | | | | | | The values 2147483648.0 and 4294967294.0 are too larget to be stored in single precision floats. Forcing these to be singles causes bits to be lost, which results in errors in some pixel transfer tests. This fixes bug #22344.
* | mesa: make query-related driver fallback functions staticBrian Paul2009-06-192-22/+19
| | | | | | | | Plug them in via _mesa_init_query_object_functions().
* | mesa: make buffer object-related driver fallback functions staticBrian Paul2009-06-192-55/+39
| | | | | | | | Plug them in via _mesa_init_buffer_object_functions().
* | mesa: create/destroy buffer objects via driver functionsBrian Paul2009-06-191-2/+2
| |
* | Merge branch 'ext-provoking-vertex'Brian Paul2009-06-1910-2363/+2484
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: docs/relnotes-7.6.html progs/tests/Makefile src/gallium/drivers/softpipe/sp_prim_vbuf.c src/glx/x11/indirect.c src/mesa/glapi/Makefile src/mesa/glapi/dispatch.h src/mesa/glapi/glapioffsets.h src/mesa/glapi/glapitable.h src/mesa/glapi/glapitemp.h src/mesa/glapi/glprocs.h src/mesa/main/dlist.c src/mesa/main/enums.c src/mesa/sparc/glapi_sparc.S src/mesa/x86-64/glapi_x86-64.S src/mesa/x86/glapi_x86.S
| * | mesa: enable GL_EXT_provoking_vertex for sw driversBrian Paul2009-06-011-0/+1
| | |
| * | mesa: glGet queries for GL_EXT_provoking_vertexBrian Paul2009-05-282-0/+31
| | |
| * | mesa: exec/dlist functions for glProvokingVertexEXT()Brian Paul2009-05-284-9/+77
| | |
| * | mesa: data structure updates for GL_EXT_provoking_vertexBrian Paul2009-05-283-0/+9
| | |
| * | mesa: regenerated enums for GL_EXT_provoking_vertexBrian Paul2009-05-281-2350/+2362
| | |
* | | Merge branch 'mesa_7_5_branch'Brian Paul2009-06-167-29/+30
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: src/mesa/main/api_validate.c
| * | mesa: fix incorrect viewport clamping in _mesa_set_viewport()Brian Paul2009-06-161-2/+2
| | | | | | | | | | | | | | | A 0 by 0 viewport size is legal. Don't clamp against lower bound of one. The error checking earlier in the function prevents negative values.
| * | mesa: Always return a value.José Fonseca2009-06-151-0/+1
| | |
| * | mesa: Use appropriate float/integer types.José Fonseca2009-06-152-3/+3
| | |
| * | mesa: Use type modifier for float constants.José Fonseca2009-06-153-21/+21
| | |
| * | mesa: Use integer type with appropriate sign.José Fonseca2009-06-152-4/+4
| | |
* | | Merge branch 'arb_map_buffer_range'Brian Paul2009-06-158-1814/+2073
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: docs/relnotes-7.6.html src/mesa/main/mtypes.h
| * | | mesa: implement GL_ARB_map_buffer_rangeBrian Paul2009-06-087-13/+260
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only enabled for software drivers at this point. Note that the gl_buffer_object::Access enum field has been replaced by a gl_buffer_object::AccessFlags bitfield. The new field is a mask of the GL_MAP_x_BIT flags which is a superset of the old GL_READ_ONLY, GL_WRITE_ONLY and GL_READ_WRITE modes. When we query GL_BUFFER_ACCESS_ARB we translate the bitfield into the conventional enum values.
| * | | mesa: regenerated files for GL_ARB_map_buffer_rangeBrian Paul2009-06-081-1801/+1813
| | | |
| * | | mesa: reorder fields, update comments for gl_buffer_objectBrian Paul2009-06-081-8/+11
| | | |
* | | | mesa: use larger initial refcount for NullBufferObjBrian Paul2009-06-121-1/+1
| | | | | | | | | | | | | | | | | | | | Refcounting of the null/default buffer object isn't perfect yet so be extra safe.
* | | | mesa: use _mesa_reference_buffer_object() in a few placesBrian Paul2009-06-121-5/+9
| | | |
* | | | Merge branch 'mesa_7_5_branch'Jakob Bornecrantz2009-06-123-4/+54
|\ \ \ \ | | |/ / | |/| |
| * | | mesa: Enable uploads of only depth to z24s8 texturesJakob Bornecrantz2009-06-121-3/+36
| | | |
| * | | mesa: add default function for ctx->Driver.CheckQuery() hookBrian Paul2009-06-112-1/+18
| | | |
* | | | Merge branch 'mesa_7_5_branch'José Fonseca2009-06-112-1/+11
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/state_tracker/st_cb_fbo.c src/mesa/state_tracker/st_framebuffer.c