summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/fbobject.c
Commit message (Collapse)AuthorAgeFilesLines
* mesa: Move GL_RGB565 workaround into fbobject.cKristian Høgsberg2010-04-271-0/+15
|
* mesa: Add OES_EGL_image to extension list.Chia-I Wu2010-04-061-0/+6
|
* mesa: Add missing features.Chia-I Wu2010-03-301-1/+1
| | | | | | | Add features tested in the code but missing from mfeatures.h. This also fixes some tests of features. They should be tested with "#if", not "#ifdef".
* mesa: added GL3 buffer attachment aliasesBrian Paul2010-03-201-0/+4
|
* mesa: raise an error when trying to bind non-existant texture to FBOBrian Paul2010-03-101-0/+8
| | | | | | | | If the user calls glRenderBufferTexture(texture=N) but texture N doesn't name an existing texture, raise GL_INVALID_ENUM. Plus, add a comment about some questionable error checking code in framebuffer_texture(). Ian?
* mesa: remove redundant call to _mesa_base_fbo_format()Brian Paul2010-02-251-1/+1
|
* mesa: put declaration before codeBrian Paul2010-02-241-1/+1
|
* core: Implement GL_OES_EGL_image entry pointsKristian Høgsberg2010-02-241-0/+24
|
* Replace the _mesa_*printf() wrappers with the plain libc versionsKristian Høgsberg2010-02-191-25/+25
|
* mesa: fix int/uint comparison warningsBrian Paul2010-01-271-1/+1
| | | | Reported by Karl Schultz.
* Merge branch 'mesa_7_7_branch'Brian Paul2010-01-261-8/+19
|\ | | | | | | Merging was easier than cherry picking in this instance.
| * mesa: Don't bind DRAW/READ_FRAMEBUFFER separately without FBO blit supportErik Wien2010-01-261-8/+19
| | | | | | | | | | | | | | | | | | | | | | If GL_EXT_framebuffer_blit was not supported _mesa_DeleteFramebuffersEXT would raise an error when deleting the currently bound framebuffer. This because it tried to bind the default DRAW- and READ_FRAMEBUFFER separately. This patch binds the default FRAMEBUFFER instead in that case. Encountered in the fbo/fbo-copyteximage piglit test on R600. Patch cleaned up a bit by Brian Paul.
* | Merge branch 'mesa_7_7_branch'Brian Paul2010-01-221-3/+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 headers from fbobject.c.Vinson Lee2010-01-181-3/+0
| |
* | mesa: added comment about future FBO formatsBrian Paul2010-01-191-0/+3
|/
* mesa: check BaseLevel, MaxLevel in _mesa_GenerateMipmapEXT()Brian Paul2009-11-161-0/+5
|
* mesa: use _mesa_get_current_tex_object()Brian Paul2009-11-161-3/+1
|
* mesa: fix some begin/end render-to-texture logicbrian2009-11-101-21/+38
| | | | | | | | | Before, we weren't aggressive enough in checking for the start or end of render-to-texture. In particular, if only the ctx->ReadBuffer had texture attachments, we were treating that as a render-to-texture case. This fixes a regression from commit 75bdbdd90b15c8704d87ca195a364ff6a42edbb1 "intel: Don't validate in a texture image used as a render target."
* mesa: move check_begin/end_texture_render() callsbrian2009-11-101-9/+11
|
* mesa: new vars: oldDrawFb, oldReadFb in _mesa_BindFramebufferEXT()brian2009-11-101-3/+7
|
* mesa: rename vars in _mesa_BindFramebufferEXT()brian2009-11-101-22/+21
|
* mesa: added comment for check_begin_texture_render()brian2009-11-101-0/+5
|
* mesa: Attempt to pair up Driver.RenderTexture and FinishRenderTexture()Eric Anholt2009-11-061-0/+4
| | | | | | | | | | This is probably not 100% complete (bind vs unbind may still not pair up exactly), but it should help out drivers which are relying on FinishRenderTexture to be called when we're done rendering to a particular texture level, not just when we're done rendering to the object at all. This is the case for the one consumer of FinishRenderTexture() so far: the gallium state tracker. Noticed when trying to make use of FRT() in the intel driver.
* mesa: clean-up, remove some flushing in FBO functionsBrian Paul2009-11-031-7/+11
| | | | | Remove some unneeded flushes. Replace FLUSH_CURRENT w/ FLUSH_VERTICES in other places.
* mesa: fix indentationBrian Paul2009-11-031-2/+1
|
* mesa: avoid extraneous _NEW_BUFFER changes in _mesa_BindFramebufferEXT()Brian Paul2009-11-031-7/+10
|
* mesa: Fix compilation errors and warnings when features are disabled.Chia-I Wu2009-10-291-0/+2
| | | | | | Some of the fixes are cherry-picked from opengl-es branch. Signed-off-by: Chia-I Wu <[email protected]>
* Merge branch 'texformat-rework'Brian Paul2009-10-281-97/+105
|\ | | | | | | | | | | | | | | | | | | | | | | 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: remove a bunch of gl_renderbuffer fieldsBrian Paul2009-10-081-93/+97
| | | | | | | | | | | | _ActualFormat is replaced by Format (MESA_FORMAT_x). ColorEncoding, ComponentType, RedBits, GreenBits, BlueBits, etc. are all replaced by MESA_FORMAT_x queries.
| * mesa: replace gl_texture_format with gl_formatBrian Paul2009-09-301-2/+2
| | | | | | | | | | | | Now gl_texture_image::TexFormat is a simple MESA_FORMAT_x enum. ctx->Driver.ChooseTexture format also returns a MESA_FORMAT_x. gl_texture_format will go away next.
| * mesa: use more format helper functionsBrian Paul2009-09-271-5/+9
| |
* | mesa: debug code for glBlitFramebuffer()Brian Paul2009-10-271-0/+55
| |
* | Merge branch 'mesa_7_6_branch'Brian Paul2009-10-231-12/+0
|\ \
| * | mesa: remove FBO texture depth/stencil testBrian Paul2009-10-231-12/+0
| | | | | | | | | | | | | | | The texture format should not be checked until validation time since the format might be changed by a subsequent glTexImage() call.
* | | mesa: simplify att->CubeMapFace assignmentBrian Paul2009-10-231-6/+1
| | |
* | | mesa: more detailed error messages in fbo codeBrian Paul2009-10-231-2/+5
| | |
* | | mesa: minor clean up in check_begin_texture_render()Brian Paul2009-10-121-1/+1
| | |
* | | mesa: Remove another unexplained Flush call, this time from BindFramebuffer.Eric Anholt2009-10-021-3/+0
| | | | | | | | | | | | | | | Combined with the previous fix, it takes cairo-gl firefox-talos-gfx time from 120 seconds to 90 seconds on my GM45.
* | | Revert "Flush driver, not just tnl module."Eric Anholt2009-10-021-26/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit df058298e1570eea8712f9bb051f674fab2eaf24. It didn't explain why it was required, doesnt appear to be required, and is a significant performance penalty for cairo-gl firefox. Conflicts: src/mesa/main/fbobject.c
* | | mesa: use _mesa_get_current_tex_unit() helperBrian Paul2009-09-281-1/+2
| |/ |/|
* | mesa: minor clean-upBrian Paul2009-09-151-3/+3
| |
* | mesa: clean-up fbo debug codeBrian Paul2009-09-151-16/+23
|/
* mesa: move assertions in test_attachment_completeness()Brian Paul2009-08-141-5/+7
| | | | Put the assertions after the error checks.
* mesa: generate GL_INVALID_OPERATION for missing z/stencil when blittingBrian Paul2009-08-051-2/+6
| | | | | | If glBlitFramebuffer() is called with GL_DEPTH_BUFFER_BIT or GL_STENCIL_BUFFER_BIT and the src/dst depth/stencil buffers are absent, report an error.
* 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: allow depth/stencil textures to be attached to GL_STENCIL_ATTACHMENTMathias Fröhlich2009-05-191-4/+14
| | | | See sourceforge bug #2793846.
* mesa: protect driver.flush() with FLUSH_CURRENTKeith Whitwell2009-04-221-7/+6
| | | | | | Need to do this to ensure vbo code unmaps its buffers before calling the driver, which may be sitting on top of a memory manager which objects to firing commands from a mapped buffer.
* mesa: avoid extraneous calls to ctx->Driver.BindFramebuffer()Brian Paul2009-02-261-6/+13
| | | | Only call this driver function when we really need to bind different buffers.
* mesa: add some debug code to help diagnose incomplete FBO attachments (disabled)Brian Paul2009-02-171-0/+27
|
* Merge commit 'origin/gallium-master-merge'Brian Paul2009-02-101-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | This is the big merge of the gallium-0.2 branch into master. gallium-master-merge was just the staging area for it. Both gallium-0.2 and gallium-master-merge are considered closed now. Conflicts: progs/demos/Makefile src/mesa/main/state.c src/mesa/main/texenvprogram.c