summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
Commit message (Collapse)AuthorAgeFilesLines
* mesa: consolidate general ubyte texstore codeBrian Paul2012-01-301-171/+71
| | | | Reviewed-by: Eric Anholt <[email protected]>
* mesa: use _mesa_pack_ubyte_rgba_rect() in texstore codeBrian Paul2012-01-301-219/+64
| | | | | | | Simplifies the general case code in the ubyte-valued texture format functions. More consolidation to come in subsequent commits. Reviewed-by: Eric Anholt <[email protected]>
* mesa: added _mesa_pack_ubyte_rgba_rect()Brian Paul2012-01-302-0/+46
| | | | Reviewed-by: Eric Anholt <[email protected]>
* mesa: Add a flag for forcing all GLSL extensions to "warn".Eric Anholt2012-01-301-0/+6
| | | | | NOTE: This is a candidate for the 8.0 branch. Reviewed-by: Kenneth Graunke <[email protected]>
* mesa/format_unpack: add LUMINANCE 8/16 UINT/INTDave Airlie2012-01-301-0/+58
| | | | | | | | This just copies what the LUMINANCE_ALPHA bits do. Fixes piglit tests on softpipe complaining about missing unpack. Signed-off-by: Dave Airlie <[email protected]>
* mesa: remove byteswap check in fast_read_rgba_pixels_memcpy()Brian Paul2012-01-271-5/+0
| | | | | | It's handled by _mesa_format_matches_format_and_type() now. Reviewed-by: Ian Romanick <[email protected]>
* mesa: more use of _mesa_format_matches_format_and_type() in texstore codeBrian Paul2012-01-271-12/+7
| | | | | | For rgb9_e5, r11_g11_b10f, argb2101010_uint functions. Reviewed-by: Ian Romanick <[email protected]>
* mesa: more use of _mesa_format_matches_format_and_type() in texstore codeBrian Paul2012-01-271-19/+4
| | | | | | For rgb332, signed rgba8888, signed rgba888_rev functions. Reviewed-by: Ian Romanick <[email protected]>
* mesa: more use of _mesa_format_matches_format_and_type() in texstore codeBrian Paul2012-01-271-13/+7
| | | | | | For rgba5551, argb1555, argb2101010 formats. Reviewed-by: Ian Romanick <[email protected]>
* mesa: more use of _mesa_format_matches_format_and_type() in texstore codeBrian Paul2012-01-271-18/+8
| | | | For rgb565, argb8888, rgb888, argb4444 functions.
* mesa: use _mesa_format_matches_format_and_type() in texstore codeBrian Paul2012-01-271-44/+4
| | | | | | | | | | This simplifies the code quite a bit, consolidates some cases and possibly catches more cases for the memcpy path. More such changes will follow. Do just a few at a time to help bisect any possible regressions. Reviewed-by: Ian Romanick <[email protected]>
* mesa: implement more cases in _mesa_format_matches_format_and_type()Brian Paul2012-01-271-2/+22
| | | | Reviewed-by: Ian Romanick <[email protected]>
* mesa: use swapBytes parameter in _mesa_format_matches_format_and_type()Brian Paul2012-01-271-38/+93
| | | | | | | | This will let us use memcpy in more situations. We can also remove the checks for byte spapping that happen before the calls to _mesa_format_matches_format_and_type(). Reviewed-by: Ian Romanick <[email protected]>
* mesa: added swapBytes parameter to _mesa_format_matches_format_and_type()Brian Paul2012-01-273-6/+10
| | | | | | Not actually used yet though. Reviewed-by: Ian Romanick <[email protected]>
* mesa: rewrite, simplify some of the logic in ↵Brian Paul2012-01-271-9/+28
| | | | | | | | _mesa_format_matches_format_and_type() In preparation for adding GL_PACK/UNPACK_SWAP_BYTES support. Reviewed-by: Ian Romanick <[email protected]>
* mesa: add BGR888 code in _mesa_format_matches_format_and_type()Brian Paul2012-01-271-1/+1
| | | | Reviewed-by: Ian Romanick <[email protected]>
* mesa: fix error in _mesa_format_matches_format_and_type() for RGB888Brian Paul2012-01-271-1/+1
| | | | Reviewed-by: Ian Romanick <[email protected]>
* mesa: remove redundant byte swap checkBrian Paul2012-01-271-6/+2
| | | | | | The outer conditional already did the test. Reviewed-by: Ian Romanick <[email protected]>
* mesa: remove LSB-first pixel packing check in glReadPixelsBrian Paul2012-01-271-2/+1
| | | | | | GL_UNPACK_LSB_FIRST only applies to bitmap data, not glReadPixels. Reviewed-by: Ian Romanick <[email protected]>
* mesa: Avoid void * arithmetic.José Fonseca2012-01-271-1/+1
| | | | Should fix MSVC build.
* mesa: set clamp bit in glGetTexImage for GL_UNSIGNED_NORMALIZEDAnuj Phogat2012-01-271-0/+9
| | | | | | | | | | | | | Color clamping should be enabled in glGetTexImage if texture dataType is GL_UNSIGNED_NORMALIZED and format is GL_LUMINANCE or GL_LUMINANCE_ALPHA Fixes 2 Intel oglconform test cases: pxconv-gettex and pxtrans-gettex https://bugs.freedesktop.org/show_bug.cgi?id=40864 NOTE: This is a candidate for the 8.0 branch Signed-off-by: Anuj Phogat <[email protected]> Reviewed-by: Brian Paul <[email protected]>
* mesa: Don't round-trip integer texture data through a floating point temp.Eric Anholt2012-01-271-21/+24
| | | | | | | | | | | | | | | This was losing bits of precision. Fixes (with the previous commits): piglit EXT_texture_integer/getteximage-clamping piglit EXT_texture_integer/getteximage-clamping GL_ARB_texture_rg oglc advanced.mipmap.upload Regresses oglc negative.typeFormatMismatch.teximage from fail to abort, because it's been hitting texstore for a format/type combo that shouldn't happen. NOTE: This is a candidate for the 8.0 branch. Reviewed-by: Brian Paul <[email protected]>
* mesa: When unpacking signed integer pixel data, don't clamp to 0.Eric Anholt2012-01-271-33/+12
| | | | | | | | | | | | In the core, we always treat spans of int/uint data as uint, so this extract function was truncating storage of integer pixel data to a n int texture to (0, max_int) instead of (min_int, max_int). There is probably missing code for handling truncation on conversion between pixel formats, still, but this does improve things. NOTE: This is a candidate for the 8.0 branch. Reviewed-by: Brian Paul <[email protected]>
* mesa: Add clamping for packing of integer data.Eric Anholt2012-01-271-4/+4
| | | | | | | | | | Mostly fixes piglit EXT_texture_integer/getteximage-clamping. The remaining failure involves precision loss on storing of int32 texture data (something I knew was an issue, but wasn't trying to test). NOTE: This is a candidate for the 8.0 branch. Reviewed-by: Brian Paul <[email protected]>
* mesa: Add missing format unpack for some integer texture formats.Eric Anholt2012-01-271-0/+321
| | | | | | | | | | | | | This cut and paste is pretty awful. I'm tempted to do a lot of this using preprocessor tricks for customizing the parameter type from a template function, but that's just a different sort of hideous. Fixes 8 Intel oglconform int-textures cases. NOTE: This is a candidate for the 8.0 branch. v2: Add alpha formats, too. Reviewed-by: Brian Paul <[email protected]>
* mesa: Fix handling of glCopyBufferSubData() for src == dst.Eric Anholt2012-01-271-6/+19
| | | | | | | | Fixes piglit ARB_copy_buffer-overlap, on swrast, which previously assertion failed. Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Ian Romanick <[email protected]>
* mesa: Fix display list handling for GL_EXT_framebuffer_multisample.Eric Anholt2012-01-271-0/+3
| | | | | | | | | | | | | | | From the extension spec: Added to section 5.4, as part of the discussion of which commands are not compiled into display lists: "Certain commands, when called while compiling a display list, are not compiled into the display list but are executed immediately. These are: ..., RenderbufferStorageMultisampleEXT..." Fixes piglit EXT_framebuffer_multisample/dlist. Reviewed-by: Brian Paul <[email protected]>
* mesa: Fix display list handling for EXT_framebuffer_object.Eric Anholt2012-01-271-0/+18
| | | | | | | | | | | | | | | | | | | | Noticed when handling a similar problem in EXT_framebuffer_multisample. From the EXT_framebuffer_object spec: Added to section 5.4, as part of the discussion of which commands are not compiled into display lists: "Certain commands, when called while compiling a display list, are not compiled into the display list but are executed immediately. These are: ..., GenFramebuffersEXT, BindFramebufferEXT, DeleteFramebuffersEXT, CheckFramebufferStatusEXT, GenRenderbuffersEXT, BindRenderbufferEXT, DeleteRenderbuffersEXT, RenderbufferStorageEXT, FramebufferTexture1DEXT, FramebufferTexture2DEXT, FramebufferTexture3DEXT, FramebufferRenderbufferEXT, GenerateMipmapEXT..." Reviewed-by: Brian Paul <[email protected]>
* mesa: remove ctx->Const.sRGBCapableMarek Olšák2012-01-253-5/+2
| | | | | | | It always had the same value as ctx->Extensions.EXT_framebuffer_sRGB. Reviewed-by: Ian Romanick <[email protected]> Reviewed-by: Dave Airlie <[email protected]>
* mesa: allow exposing GL3 without EXT_texture_integerMarek Olšák2012-01-255-16/+37
| | | | | | | | | | | Strictly speaking, it's not legal to expose EXT_texture_integer without EXT_gpu_shader4. It might be even dangerous (apps can assume EXT_gpu_shader4 is available without checking for it). The check in compute_version is removed as well, because that's already covered by GLSLVersion >= 130. Reviewed-by: Brian Paul <[email protected]>
* mesa: add missing integer alpha formats to _mesa_base_fbo_formatMarek Olšák2012-01-251-0/+9
| | | | Reviewed-by: Brian Paul <[email protected]>
* mesa: remove obsolete comment in version.cMarek Olšák2012-01-251-1/+0
| | | | Pointed out by Brian Paul.
* mesa: Fix CopyTex{Sub,}Image error checks for integer vs non-integer.Eric Anholt2012-01-241-8/+31
| | | | | | | | Fixes Intel oglconform negative.typeFormatMismatch.copyteximage. NOTE: This is a candidate for the 8.0 branch. Reviewed-by: Brian Paul <[email protected]>
* mesa: Add missing integer R/RG cases to _mesa_is_color_format().Eric Anholt2012-01-241-0/+12
| | | | | | | | | This is part of fixing Intel oglconform negative.typeFormatMismatch.copyteximage. NOTE: This is a candidate for the 8.0 branch. Reviewed-by: Brian Paul <[email protected]>
* mesa: Add the remaining from/to types for GL_EXT_texture_integer (and R/RG).Eric Anholt2012-01-242-51/+176
| | | | | | | | | | | This aborts and crashes in intel oglconform's int-textures into being just rendering failures. Clamping isn't handled yet. v2: Add missing "break". v3: Drop the int/uint distinction, since they don't need different clamping. NOTE: This is a candidate for the 8.0 branch. Reviewed-by: Brian Paul <[email protected]> (v2)
* mesa: Add support for glGetTexImage on GL_TEXTURE_1D_ARRAYEric Anholt2012-01-241-2/+7
| | | | | | | | | | | Similarly to how we handle this in texstore, we have to remap height to depth so that we MapTextureImage each image layer individually. Fixes part of Intel oglconform's int-textures advanced.fbo.rtt NOTE: This is a candidate for the 8.0 branch. Reviewed-by: Brian Paul <[email protected]>
* mesa: s/GLuint col/GLint col/ to avoid signed/unsigned comparison warnings.Eric Anholt2012-01-241-8/+8
| | | | Suggested-by: Brian Paul <[email protected]>
* mesa: Add support for glGetTexImage() from integer textures.Eric Anholt2012-01-241-38/+80
| | | | | | | | | This is a step toward fixing Intel oglconform's int-textures advanced.fbo.rtt. NOTE: This is a candidate for the 8.0 branch. Reviewed-by: Brian Paul <[email protected]>
* mesa: update comments, fix whitespace in dd.hBrian Paul2012-01-241-21/+14
|
* mesa: remove ctx->Driver.Map/UnmapTexture() hooksBrian Paul2012-01-241-5/+0
| | | | No longer used anywhere.
* mesa: update comments for gl_renderbufferBrian Paul2012-01-241-16/+9
|
* mesa/swrast/drivers: remove obsolete gl_renderbuffer fieldsBrian Paul2012-01-241-7/+0
| | | | This removes the last of the legacy fields from gl_renderbuffer.
* mesa: remove gl_renderbuffer::WrappedBrian Paul2012-01-242-8/+0
| | | | There's no such thing as renderbuffer wrappers anymore.
* mesa: rename gl_renderbuffer::Data to BufferBrian Paul2012-01-241-1/+1
| | | | To better indicate that this pointer to the malloc'd memory.
* mesa: move freeing of software renderbuffers into swrastBrian Paul2012-01-241-6/+1
|
* mesa: remove gl_renderbuffer::DataTypeBrian Paul2012-01-242-2/+0
|
* mesa: remove gl_renderbuffer:RowStride fieldBrian Paul2012-01-241-3/+2
|
* mesa: finally, remove the GetRow/PutRow/etc functionsBrian Paul2012-01-241-37/+0
|
* mesa: remove obsolete PutRow, etc assignmentsBrian Paul2012-01-241-17/+0
|
* mesa: add new gl_renderbuffer fieldsBrian Paul2012-01-241-1/+6
| | | | | | | | | These are temporary, actually, but they'll make follow-on work easier to implement in a step-by-step manner. Eventually the Map and RowStrideBytes fields will go into a new swrast_renderbuffer type, but adding that type now would involve touching a _lot_ of code that'll eventually be removed. The fields marked as obsolete will go away completely at some point.