summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/texobj.c
Commit message (Collapse)AuthorAgeFilesLines
* mesa: use _mesa_is_user_fbo() and _mesa_is_winsys_fbo() functionsBrian Paul2012-01-121-1/+1
| | | | | | Rather than testing the fbo's name against zero. Reviewed-by: José Fonseca <[email protected]>
* mesa: fix cubemap depth completeness testDave Airlie2012-01-111-3/+5
| | | | | | | | This fixes the test to allow cube/depth combinations on GL3 or EXT_gpu_shader4. Signed-off-by: Dave Airlie <[email protected]> Reviewed-by: Eric Anholt <[email protected]>
* mesa: remove unused _mesa_init_teximage_fields() target parameterBrian Paul2012-01-041-1/+1
| | | | | Reviewed-by: Ian Romanick <[email protected]> Reviewed-by: Yuanhan Liu <[email protected]>
* mesa: simplify Driver.TexImage() parametersBrian Paul2011-12-301-2/+2
| | | | | | | | As with TexSubImage(), the target, level and texObj values can be obtained through the texImage pointer. Reviewed-by: Chad Versace <[email protected]> Reviewed-by: Eric Anholt <[email protected]>
* mesa: remove the ctx->Driver.IsTextureResident() hookBrian Paul2011-12-081-20/+3
| | | | | | | No driver implemented this and we always returned "True" for residence queries. Reviewed-by: Ian Romanick <[email protected]>
* mesa: check for immutable texture in _mesa_test_texobj_completeness()Brian Paul2011-11-071-4/+9
| | | | | | One of the points of GL_ARB_texture_storage is to make it impossible to have malformed mipmap stacks. If we know the texture object is immutable, we can skip a bunch of size checking.
* mesa: add support for GL_OES_EGL_image_externalChia-I Wu2011-11-031-3/+15
| | | | | | | | | This is an OpenGL ES specific extension. External textures are textures that may be sampled from, but not be updated (no glTexSubImage* and etc.). The image data are taken from an EGLImage. Reviewed-by: Brian Paul <[email protected]> Acked-by: Jakob Bornecrantz <[email protected]>
* mesa: add note about immutable textures for _mesa_test_texobj_completeness()Brian Paul2011-10-311-0/+4
|
* mesa: better debug messages in _mesa_test_texobj_completeness()Brian Paul2011-10-191-19/+22
| | | | And use a gl_texture_image var to simplify the code a bit.
* mesa: add new DeleteTextureImage() driver hookBrian Paul2011-09-171-1/+1
| | | | | | Matches the NewTextureImage() hook. With new subclasses of gl_texture_image coming we need a new hook to properly delete objects of those subclasses.
* mesa: Remove API facing bits of EXT_paletted_texture and ↵Ian Romanick2011-09-061-3/+0
| | | | | | | | | | | | | | EXT_shared_texture_palette This was also discussed at XDS 2010. However, actually making the change was delayed because several drivers still exposed these extensions to significant benefit (e.g., tdfx). Now that those drivers have been removed, this code can be removed as well. v2: A lot of bits that were missed in the previous patch have been removed. Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
* mesa: don't use K&R style function pointer callsBrian Paul2011-08-041-3/+3
|
* mesa: use inline function wrapper for _mesa_reference_texobj()Brian Paul2011-07-141-6/+4
|
* mesa: Check the texture against all units in unbind_texobj_from_texunits().Henri Verbeet2011-07-071-1/+1
| | | | | | | | NOTE: This is a candidate for the 7.11 branch. Signed-off-by: Henri Verbeet <[email protected]> Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Ian Romanick <[email protected]>
* mesa: Flag _NEW_BUFFERS when unbinding an attachment on glDeleteTextures.Eric Anholt2011-06-181-0/+2
| | | | | | | | | | | The _ColorDrawBuffers[] wouldn't get updated despite us having updated what it depends on (Attachments[]->Renderbuffer). Other callers of _mesa_remove_attachment are already flagging _NEW_BUFFERS for other reasons. The specific bug report that led to this fix (and the fbo-finish-deleted testcase) was fixed by 23b6f9606dc247488835745668b3686218612536, though. Reviewed-by: Brian Paul <[email protected]>
* mesa: EXT_texture_sRGB_decode little fixupMarek Olšák2011-05-131-0/+1
| | | | It doesn't fix bug 37150 though.
* mesa: implement AMD_seamless_cubemap_per_textureMarek Olšák2011-05-061-0/+2
|
* mesa: move sampler state into new gl_sampler_object typeBrian Paul2011-04-101-44/+46
| | | | | | gl_texture_object contains an instance of this type for the regular texture object sampling state. glGenSamplers() generates new instances of gl_sampler_object which can override that state with glBindSampler().
* mesa: core support for GL_ARB_texture_buffer_objectBrian Paul2011-04-051-1/+8
| | | | No GLSL or driver support yet.
* mesa: use _mesa_get_current_tex_unit() helper in BindTexture()Brian Paul2011-03-161-2/+2
|
* mesa: remove unneeded local var in BindTexture()Brian Paul2011-03-161-3/+3
|
* mesa: clean up the glBindTexture early out code a bitBrian Paul2011-03-161-10/+12
|
* mesa/swrast: implement EXT_texture_sRGB_decodeDave Airlie2011-01-161-0/+1
| | | | | | | This implements the extension by choosing a different set of texture fetch functions when the texture parameter changes. Signed-off-by: Dave Airlie <[email protected]>
* mesa: Consider textures incomplete when maxlevel < baselevel.Eric Anholt2011-01-051-0/+6
| | | | | See section 3.8.10 of the GL 2.1 specification. There's no way to do anything sane with that, and drivers would get all sorts of angry.
* mesa: set gl_texture_object::_Complete=FALSE in incomplete()Brian Paul2010-12-061-27/+5
|
* mesa: test for cube map completeness in glGenerateMipmap()Brian Paul2010-12-061-0/+38
| | | | | | | The texture is not cube complete if the base level images aren't of the same size and format. NOTE: This is a candidate for the 7.9 branch.
* mesa: pass gl_format to _mesa_init_teximage_fields()Brian Paul2010-11-181-3/+5
| | | | | | | | | | | This should prevent the field going unset in the future. See bug http://bugs.freedesktop.org/show_bug.cgi?id=31544 for background. Also remove unneeded calls to clear_teximage_fields(). Finally, call _mesa_set_fetch_functions() from the _mesa_init_teximage_fields() function so callers have one less thing to worry about.
* mesa: whitespace cleanupsBrian Paul2010-11-161-35/+37
|
* mesa: silence new warnings in texobj.cBrian Paul2010-11-021-4/+2
| | | | | | Silences warning such as: main/texobj.c:442:40: warning: ISO C99 requires rest arguments to be used main/texobj.c:498:58: warning: ISO C99 requires rest arguments to be used
* mesa: Don't compute an unused texture completeness debug string.Eric Anholt2010-11-021-9/+12
| | | | | This showed up at about 1% on cairo-gl firefox-talos-gfx, where glClear() is called while a texture is incomplete.
* Drop GLcontext typedef and use struct gl_context insteadKristian Høgsberg2010-10-131-12/+12
|
* mesa: don't call valid_texture_object() in non-debug buildsBrian Paul2010-09-201-5/+2
| | | | | | | | | This reverts commit c32bac57ed445e48856d74113364287ed6e5cdd4 and silences the warning differently. The _mesa_reference_texobj() function is called quite a bit and we don't want to call valid_texture_object() all the time in non- debug builds.
* mesa: Silence "'valid_texture_object' defined but not used" warning.Vinson Lee2010-09-171-1/+5
|
* mesa: rename src/mesa/shader/ to src/mesa/program/Brian Paul2010-06-101-1/+1
|
* mesa: s/sprintf/_mesa_snprintf/Vinson Lee2010-05-021-2/+2
|
* Replace the _mesa_*printf() wrappers with the plain libc versionsKristian Høgsberg2010-02-191-3/+3
|
* Replace _mesa_malloc, _mesa_calloc and _mesa_free with plain libc versionsKristian Høgsberg2010-02-191-1/+1
|
* mesa: replace _mesa_bzero() with memset()Brian Paul2010-02-191-1/+1
|
* Merge branch 'mesa_7_7_branch'Brian Paul2010-01-221-1/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/draw/draw_context.c src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c src/gallium/auxiliary/pipebuffer/Makefile src/gallium/auxiliary/pipebuffer/SConscript src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c src/gallium/auxiliary/tgsi/tgsi_scan.c src/gallium/drivers/i915/i915_surface.c src/gallium/drivers/i915/i915_texture.c src/gallium/drivers/llvmpipe/lp_setup.c src/gallium/drivers/llvmpipe/lp_tex_sample_c.c src/gallium/drivers/llvmpipe/lp_texture.c src/gallium/drivers/softpipe/sp_prim_vbuf.c src/gallium/state_trackers/xorg/xorg_dri2.c src/gallium/winsys/drm/intel/gem/intel_drm_api.c src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c src/gallium/winsys/drm/radeon/core/radeon_drm.c src/gallium/winsys/drm/vmware/core/vmw_screen_dri.c src/mesa/state_tracker/st_cb_clear.c
| * mesa: Remove unnecessary header from texobj.c.Vinson Lee2010-01-171-1/+0
| |
* | mesa: make texture BorderColor a union of float/int/uintBrian Paul2010-01-041-4/+4
| | | | | | | | | | | | | | | | When we have integer-valued texture formats, the texture border color must also store integer and uint values. With GL 3.0, the new glTexParameterIiv() and glTexParameterIuiv() functions can set the border color to int or uint values.
* | Merge branch 'mesa_7_7_branch'Brian Paul2009-12-111-1/+1
|\| | | | | | | | | | | Conflicts: src/gallium/state_trackers/xorg/xorg_xv.c src/mesa/drivers/dri/intel/intel_span.c
| * Merge branch 'mesa_7_6_branch' into mesa_7_7_branchBrian Paul2009-12-111-1/+1
| |\
| | * mesa: fix baseLevel >= MAX_TEXTURE_LEVELS testBrian Paul2009-12-091-1/+1
| | | | | | | | | | | | | | | This fixes invalid array indexing when baseLevel == MAX_TEXTURE_LEVELS. See bug 25528.
* | | mesa: added comment for target_enum_to_index()Brian Paul2009-12-011-1/+2
|/ /
* | Merge branch 'texformat-rework'Brian Paul2009-10-281-0/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/radeon/radeon_fbo.c src/mesa/drivers/dri/s3v/s3v_tex.c src/mesa/drivers/dri/s3v/s3v_xmesa.c src/mesa/drivers/dri/trident/trident_context.c src/mesa/main/debug.c src/mesa/main/mipmap.c src/mesa/main/texformat.c src/mesa/main/texgetimage.c
| * | mesa: choose texture format in _mesa_get_fallback_texture()Brian Paul2009-10-281-0/+5
| | |
* | | mesa: remove unused ctx->Driver.PrioritizeTextures() hookBrian Paul2009-10-141-2/+0
| | |
* | | Merge branch 'mesa_7_6_branch'Brian Paul2009-10-051-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: src/gallium/auxiliary/util/u_cpu_detect.c
| * | mesa: fix incorrect default texture binding in unbind_texobj_from_texunits()Brian Paul2009-10-021-1/+1
| | | | | | | | | | | | | | | If we deleted a currently bound texture, we were always reverting the texture binding to the default 1D texture rather than the proper default texture.