summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-11-15android: make stlport happyandroid-gingerbread-nextChia-I Wu2-3/+0
2011-11-15android: target LLVM 2.8Chia-I Wu1-14/+6
2011-11-15android: add wip llvmpipe supportChia-I Wu6-1/+186
Failed attemp using llvm-2.9-dev_2.9+dfsg-3_i386.deb.
2011-11-15android: advertise GL_ARB_texture_non_power_of_twoChia-I Wu1-1/+1
It maps to DisplayHardware::NPOT_EXTENSION in SurfaceFlinger. Does not seem to matter when EGL_ANDROID_image_native_buffer is available.
2011-11-15android: disable SSE translateChia-I Wu1-1/+1
It does not support FIXED and will fail anyway.
2011-11-15android: always flush softpipe to support SurfaceFlingerChia-I Wu1-1/+1
Just a hack. Is this still needed?
2011-11-15i915: enable GL_APPLE_texture_2D_limited_npotChia-I Wu2-0/+2
Enable GL_ARB_texture_non_power_of_two for GLESv1 to advertise GL_APPLE_texture_2D_limited_npo. The former is actually a superset of the latter, but we really want to enable NPOT support in some way.
2011-11-15radeon: use _mesa_readpixels() instead of _swrast_ReadPixels()Brian Paul1-7/+5
2011-11-15i965: use _mesa_readpixels() instead of _swrast_ReadPixels()Brian Paul1-6/+5
2011-11-15mesa: convert unpack functions to operate on an array of valuesBrian Paul1-630/+900
Reviewed-by: Eric Anholt <eric@anholt.net>
2011-11-15mesa: new BYTE/SHORT_TO_FLOATZ() macrosBrian Paul3-42/+17
Rather than redefining the BYTE/SHORT_TO_FLOAT macros, just define new ones with different names. These macros preserve zero when converting. Reviewed-by: Eric Anholt <eric@anholt.net>
2011-11-15mesa: move CEILING() macro into macros.hBrian Paul3-7/+5
Reviewed-by: Eric Anholt <eric@anholt.net>
2011-11-15mesa: remove unused macros in macros.hBrian Paul1-26/+0
Reviewed-by: Eric Anholt <eric@anholt.net>
2011-11-15mesa: consolidate cases in _mesa_components_in_format()Brian Paul1-28/+12
and _mesa_sizeof_packed_type() Reviewed-by: Eric Anholt <eric@anholt.net>
2011-11-15swrast: fix glReadPixels from texture attachmentBrian Paul1-0/+13
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=42635
2011-11-15st/mesa: check for missing VBO in setup_interleaved_attribs()Brian Paul1-3/+3
This fixes a crash with the piglit vbo-too-small test. Reviewed-by: José Fonseca <jfonseca@vmware.com>
2011-11-15util/draw: replace assertions with conditionals in util_draw_max_index()Brian Paul2-13/+39
Don't assert/die if a VBO is too small. Return zero instead. For debug builds, emit a warning message since this is an unusual situation that might indicate that there's a bug in the app. Note that util_draw_max_index() now returns max_index+1 instead of max_index. This lets us return zero to indicate that one of the VBOs is too small to draw anything. Fixes a failure with the new piglit vbo-too-small test. Reviewed-by: José Fonseca <jfonseca@vmware.com>
2011-11-15st/mesa: remove most of the ReadPixels codeBrian Paul2-634/+8
We can use the core Mesa code for glReadPixels now. We just have to validate state and flush the bitmap cache before reading.
2011-11-15st/mesa: remove dependencies on code in st_cb_readpixels.cBrian Paul3-7/+19
st_cb_readpixels.c is going away next. Acked-by: Eric Anholt <eric@anholt.net>
2011-11-15mesa: remove _swrast_ReadPixels()Brian Paul5-533/+1
We use the code in main/readpix.c now. Acked-by: Eric Anholt <eric@anholt.net>
2011-11-15mesa: use _mesa_readpixels() as default driver hookBrian Paul1-1/+2
Acked-by: Eric Anholt <eric@anholt.net>
2011-11-15mesa: move swrast ReadPixels code into core MesaBrian Paul2-0/+493
The swrast ReadPixels code has no dependencies on swrast since moving to Map/UnmapRenderbuffer(). We'll be able to remove s_readpix.c and remove the state tracker's glReadPixels code next. Acked-by: Eric Anholt <eric@anholt.net>
2011-11-15st/mesa: check renderbuffer orientation in st_MapRenderbuffer()Brian Paul1-5/+27
We'll soon be able to use these for a core Mesa implementation of glReadPixels. Acked-by: Eric Anholt <eric@anholt.net>
2011-11-15mesa: remove support for software alpha buffersBrian Paul2-376/+0
This was only used by the xlib driver to add an alpha channel to the front/window color buffer. This was no longer going to work well with the move to direct mapping of renderbuffers. Reviewed-by: Eric Anholt <eric@anholt.net>
2011-11-15xlib: remove xm_image.[ch] filesBrian Paul3-117/+0
Reviewed-by: Eric Anholt <eric@anholt.net>
2011-11-15xlib: remove a ton of old xlib driver cruftBrian Paul9-3409/+4
The days of 1-bpp, 8-bpp and dithering are long behind us. Reviewed-by: Eric Anholt <eric@anholt.net>
2011-11-15xlib: use MESA_FORMAT_XRGB8888 for pixmap surfacesBrian Paul1-12/+1
We no longer have software-allocated alpha buffers so we can forget about the alpha channel. Reviewed-by: Eric Anholt <eric@anholt.net>
2011-11-15xlib: remove software alpha buffer supportBrian Paul4-26/+1
Seldom used and this won't work when we move to using Map/UnmapRenderbuffer everywhere. This will let us remove a bunch of core Mesa code too. Reviewed-by: Eric Anholt <eric@anholt.net>
2011-11-15mesa: replace GLstencil with GLubyteBrian Paul13-149/+124
2011-11-15intel: Fix intel_map_renderbuffer() for depthstencil buffers with separate ↵Chad Versace1-1/+149
stencil For a depthstencil buffer with separate stencil, intel_renderbuffer::region is null. (The regions are kept in hidden depth and stencil buffers). Since the region is null, intel_map_renderbuffer() assumed there was no data and returned a null map pointer, which in turn was dereferenced (!) by MapRenderbuffer's caller. This patch fixes intel_map_renderbuffer() to map the hidden depth buffer through the GTT and return that as the mapped pointer. Also, the stencil bits are scattered and gathered when needed. Fixes the following Piglit tests on gen7: fbo/fbo-readpixels-depth-formats hiz/hiz-depth-read-fbo-d24s8 hiz/hiz-stencil-read-fbo-d24s8 EXT_packed_depth_stencil/fbo-clear-formats EXT_packed_depth_stencil/fbo-depth-GL_DEPTH24_STENCIL8-blit EXT_packed_depth_stencil/fbo-depth-GL_DEPTH24_STENCIL8-drawpixels EXT_packed_depth_stencil/fbo-depth-GL_DEPTH24_STENCIL8-readpixels EXT_packed_depth_stencil/fbo-depthstencil-GL_DEPTH24_STENCIL8-readpixels-24_8 EXT_packed_depth_stencil/fbo-depthstencil-GL_DEPTH24_STENCIL8-readpixels-FLOAT-and-USHORT EXT_packed_depth_stencil/fbo-stencil-GL_DEPTH24_STENCIL8-readpixels Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
2011-11-15intel: Fix software detiling of system stencil buffersChad Versace2-4/+6
If a window system stencil buffer had a region with odd height, then the calculated y offset needed for software detiling was off by one. The bug existed in intel_{map,unmap}_renderbuffer_s8() and in the intel_span.c accessors. Fixes the following Piglit tests on gen7: general/depthstencil-default_fb-readpixels-24_8 general/depthstencil-default_fb-readpixels-FLOAT-and-USHORT Fixes SIGABRT in the following Piglit tests on gen7: general/depthstencil-default_fb-blit general/depthstencil-default_fb-copypixels general/depthstencil-default_fb-drawpixels-24_8 general/depthstencil-default_fb-drawpixels-FLOAT-and-USHORT Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
2011-11-15intel: Fix intel_unmap_renderbuffer_s8()Chad Versace1-2/+2
When gathering the temporary buffer's pixles into the gem buffer, we had the two buffers juxtaposed. Oops. Fixes the following Piglit tests on gen7: general/GL_SELECT - alpha-test enabled general/GL_SELECT - depth-test enabled general/GL_SELECT - no test function general/GL_SELECT - scissor-test enabled general/GL_SELECT - stencil-test enabled Fixes SIGABRT in Piglit tests EXT_framebuffer_object/fbo-stencil-* on gen7. Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
2011-11-15intel: Refactor intel_map_renderbuffer()Chad Versace1-134/+256
The function already implements 3 cases (map through GTT, blit to a temporary, and detile stencil buffer to temporary), and a 4th will be added soon: scatter/gather for depthstencil buffers using separate stencil. For sanity's sake, this factors each case out into its own function. Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
2011-11-15ir_to_mesa: don't init unfirom if link failedYuanhan Liu1-1/+3
Don't call set_unfiform_initializers if link failed, or it would trigger a GL_INVALID_OPERATION error. That's not an expected behavior of glLinkProgram function. Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com> Reviewed-by: Paul Berry <stereotype441@gmail.com>
2011-11-14glsl: Always search for an exact function signature match.Kenneth Graunke1-29/+63
Previously, we would fail to compile the following shader due to a bug in lazy built-in importing: #version 130 void main() { float f = abs(5.0); int i = abs(5); } The first call, abs(5.0), would fail to find a local signature, look through the built-ins, and import "float abs(float)". The second call, abs(5), would find the newly imported float signature in the local shader, and settle for that. Unfortunately, it failed to search the built-ins for the correct/exact signature, "int abs(int)". Thus, abs(5) ended up being a float, causing a bizarre type error when we tried to assign it to an int. Fixes piglit test builtin-overload-matching.frag. This is /not/ a candidate for stable branches, as it should only be possible to trigger this bug using GLSL 1.30's built-in functions that take integer arguments. Plus, the changes are fairly invasive. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
2011-11-14glsl: Split code to generate an ir_call out from match_function_by_name.Kenneth Graunke1-165/+173
match_function_by_name performs two fairly separate tasks: 1. Hunt down the appropriate ir_function_signature for the callee. 2. Generate the actual ir_call (assuming we found the callee). Both of these are complicated. The first has to handle exact/inexact matches, lazy importing of built-in prototypes, different scoping rules for 1.10, 1.20+, and ES. Not to mention printing a user-friendly error message with pretty-printed "maybe you meant this" candidate signatures. The second has to deal with void/non-void functions, pre-call implicit conversions for "in" parmeters, and post-call "out" call conversions. Trying to do both in one function is just too unwieldy. Time to split. This patch purely moves the code to generate an ir_call into a separate function and reindents it. Otherwise, the code is identical. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Paul Berry <stereotype441@gmail.com>
2011-11-14glsl: Add a new matching_signature() variant that returns exact/inexact.Kenneth Graunke2-0/+18
When matching function signatures across multiple linked shaders, we often want to see if the current shader has _any_ match, but also know whether or not it was exact. (If not, we may want to keep looking.) This could be done via the existing mechanisms: sig = f->exact_matching_signature(params); if (sig != NULL) { exact = true; } else { sig = f->matching_signature(params); exact = false; } However, this requires walking the list of function signatures twice, which also means walking each signature's formal parameter lists twice. This could be rather expensive. Since matching_signature already internally knows whether a match was exact or not, we can just return it to get that information for free. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Paul Berry <stereotype441@gmail.com>
2011-11-15r600g: fix the representation of control-flow instructionsMarek Olšák9-426/+536
We need something that looks like a compiler and not like some hacker put some functions together. /rant This is a band-aid for these two problems: - The R600 and EG control-flow instructions appear in switch statements next to each other, causing conflicts when adding new instructions. - The ALU control-flow instructions are bitshifted by 3 (from CF_INST 26:29 to CF_INST 23:29, as is defined by r600 ISA) even for EG, where CF_INST is 22:29. To fix this mess, the 'inst' field is bitshifted to the left either by 22, 23, or 26 (directly in the definitions), such that it can be just or'd when making bytecode without any shifting. All switch statements have been divided into two, one for R600 and the other for EG. Of course, there is a better way to do this, but that is left for future work. Tested on RV730 and REDWOOD with no regressions. v2: minor cleanup as per Alex's comment. Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
2011-11-14glsl: Remove resource count checks from ir_to_mesa and st_glsl_to_tgsiIan Romanick2-106/+0
These checks are now performed by the linker. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2011-11-14linker: Validate resource usage in the linkerIan Romanick1-0/+44
This is also done in ir_to_mesa and st_glsl_to_tgsi, but that code will be removed soon. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2011-11-14linker: Count the number of uniform components used by a shader during linkingIan Romanick2-2/+24
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2011-11-14linker: Count the number of samplers used by a shader during linkingIan Romanick2-1/+31
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2011-11-14meta: Fix restoring of fixed function texture enables.Eric Anholt1-27/+9
If they were disabled on entry, and we enabled one (like for BlitFramebuffer), we wouldn't disable it on the way out. Retain the attempted optimization here (don't keep calling to set each bit for changes that won't matter) by just setting the bits directly with appropriate flushing. Fixes misrendering on the second draw of piglit fbo-blit. Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2011-11-14meta: Don't forget to flag state when restoring texobjects.Eric Anholt1-2/+5
It's unlikely that we changed the object but no other texture parameter, but be correct anyway. Noticed by inspection. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2011-11-14st/mesa: fix system value to semantic mappingChristoph Bumiller2-0/+2
Broken by addition of SYSTEM_VALUE_VERTEX_ID in 919c53e87a1f6f5322bc1f1486bb3e6b954b00d5.
2011-11-14gallium: add TGSI_SEMANTIC_VERTEXIDChristoph Bumiller5-2/+9
2011-11-14r600g: mask write for fake VS export componentsVadim Girlin1-4/+4
2011-11-14r600g: fix op3 & write in merge_inst_groupsVadim Girlin1-1/+1
2011-11-14r600g: set max max tex/vtx instructions count to 16 for caymanAlex Deucher1-3/+1
Cayman is 16 as well. Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
2011-11-14r600g: set max tex/vtx instructions count to 16 for evergreenVadim Girlin1-1/+1
According to evergreen-isa doc 16 is max value for evergreen. More than 16 doesn't work for me. Signed-off-by: Vadim Girlin <vadimgirlin@gmail.com>