- Nov 17, 2011
-
-
Ian Romanick authored
-
Ian Romanick authored
-
- Nov 10, 2011
-
-
Emma Anholt authored
A driver trying to set up builtin uniforms is faced with a problem: How do I walk the ir_variable structure (representing an array of structs, or array of matrices, or struct, or whatever), and set up driver structures so that dereference of that uniform gets the corresponding ParameterValues[] entry. The rule in general is that each corresponding vector-sized field of an array of structs is one builtin uniform state slot. i965 relied on another invariant: each state slot has a number of unique channel swizzles corresponding to the number of elements in the field's vector, to avoid needing to walk the glsl_type in parallel to get at vector_elements. All of the builtin uniforms followed this behavior, except for gl_NormalMatrix. That's a mat3 (so 3 vec3s), but it was swizzled as 3 vec4s. Fixes piglit glsl-fs-normalmatrix. Reviewed-by: Paul Berry <stereotype441@gmail.com> (cherry picked from commit cc4ddc3a)
-
Kenneth Graunke authored
It's required for ES 1.0 and 1.1, and isn't specified for ES 2. While the comment says Mesa depends on it internally, removing it from ES2 doesn't seem to regress any Piglit or ES2 conformance tests. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> (cherry picked from commit 5785cd2b)
-
- Nov 05, 2011
-
-
Jose Fonseca authored
Recommend LLVM 2.9, it has been working quite well, and unlike earlier versions, it works out-of-the-box without patches. Update Windows instructions.
-
- Nov 03, 2011
-
-
Yuanhan Liu authored
The PBO only needs to be unmapped if one of the previous calls to _mesa_validate_pbo_* succeeded. In this case, pixels will be non-NULL. Various paths through _mesa_unmap_texmiage_pbo can hit assertion failures or segfaults if the buffer is not mapped. To work around this, move the call to _mesa_unmap_teximage_pbo inside the last 'if (pixels)' block. NOTE: this is just for 7.11 stable branch Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=42268
-
- Nov 02, 2011
-
-
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com> Reviewed-by: Corbin Simpson <MostAwesomeDude@gmail.com>
-
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com> Reviewed-by: Jose Fonseca <jfonseca@vmware.com> (cherry picked from commit 4a3be16f)
-
Marek Olšák authored
This was dead code anyway. (cherry picked from commit 21e3c585)
-
Thomas Fogal authored
I had a colleague hitting issues compiling with an old gcc3.2 system. These patches got them through. Reviewed-by: Brian Paul <brianp@vmware.com> (cherry-picked from commit cbb2b414)
-
- Oct 29, 2011
-
-
Adam Jackson authored
DRI2 supports this now - and already enables it explicitly - but drisw does not and should not. Otherwise toolkits like clutter will only ever SwapBuffers once and wait forever for an event that's not coming. Signed-off-by: Adam Jackson <ajax@redhat.com> (cherry picked from commit 25620eb1)
-
- Oct 27, 2011
-
-
Kenneth Graunke authored
In commit 3e5d3626, Eric added a homebrew workaround to fix GPU hangs in the Mesa "engine" demo and oglc's api-texcoord test. Unfortunately, his PIPE_CONTROL contains a Depth Stall, which necessitates the post-sync non-zero workaround, Fixes GPU hangs in Civilization 4, PlaneShift, Minecraft, Neverwinter Nights, 3DMMES, and hopefully Heroes of Newerth as well. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=40324 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=41096 Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net> Tested-by: Joel <k00_fol@k.kth.se> (Neverwinter Nights) Tested-by: brot <brot@minad.de> (Minecraft) Tested-by: Eric Anholt <eric@anholt.net> (3DMMES) Tested-by: Kenneth Graunke <kenneth@whitecape.org> (Civ 4 & PlaneShift) (cherry-picked from commit 3cc0a7be)
-
- Oct 26, 2011
-
-
Marek Olšák authored
The kernel currently overwrites the flags, but if we stopped doing that, this would break badly. (cherry picked from commit faa16dc4) BTW, this may be an actual fix for very old kernels. https://bugs.freedesktop.org/show_bug.cgi?id=42175 Conflicts: src/gallium/drivers/r600/evergreen_state.c src/gallium/drivers/r600/r600_state.c
-
Brian Paul authored
Passing type == GL_BITMAP returns 0 while error values return -1. This fixes glPolygonStipple being compiled into display lists. (cherry picked from commit 2ce8c355)
-
Brian Paul authored
The spec says GL_INVALID_OPERATION is generated when texture!=0 and textarget is not a legal value. We had this right for the 2D function. (cherry picked from commit ccecc08f)
-
Ben Widawsky authored
After copy buffer on preGEN6, it is necessary to wait for the blit to complete before returning data to the user. This should fix the piglit test: copy_buffer_coherency (pre-GEN6). Signed-off-by: Ben Widawsky <ben@bwidawsk.net> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (cherry picked from commit fa351bd2)
-
Emma Anholt authored
The existing error result doesn't appear in the GL 2.1 or 3.2 compatibility specs, and triggers an unexpected GL error in Intel's oglconform when it tries to reset the feedback state after usage so that the "diff the state at error time vs. context init time" code doesn't generate spurious diffs. The unexpected GL error then translates into testcase failure. Brian wants the safety check on buffer = NULL, though, so that people can't as easily set up a broken buffer. (cherry picked from commit 07e5295b)
-
Ian Romanick authored
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Brian Paul <brianp@vmware.com> Tested-by: Jin Yang <jin.a.yang@intel.com> (cherry picked from commit 24a11309)
-
Ian Romanick authored
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Brian Paul <brianp@vmware.com> Tested-by: Jin Yang <jin.a.yang@intel.com> (cherry picked from commit 13757f70)
-
Ian Romanick authored
This code was really broken before. A lot of the error checks were done much later (too late), and some of the error checks would fail. The underlying problem is that Mesa doesn't ever keep compressed paletted textures in their original format. The textures are immediately converted to some RGB or RGBA format. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=39991 Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Brian Paul <brianp@vmware.com> Tested-by: Jin Yang <jin.a.yang@intel.com> (cherry picked from commit 3ebbfc83)
-
Ian Romanick authored
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Brian Paul <brianp@vmware.com> Tested-by: Jin Yang <jin.a.yang@intel.com> (cherry picked from commit b433e7ba)
-
Ian Romanick authored
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Brian Paul <brianp@vmware.com> Tested-by: Jin Yang <jin.a.yang@intel.com> (cherry picked from commit a2cab751)
-
Ian Romanick authored
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Brian Paul <brianp@vmware.com> Tested-by: Jin Yang <jin.a.yang@intel.com> (cherry picked from commit fc0fa16b)
-
Ian Romanick authored
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Brian Paul <brianp@vmware.com> Tested-by: Jin Yang <jin.a.yang@intel.com> (cherry picked from commit a454c835)
-
Chia-I Wu authored
Add intelInitExtensionsES1 to enable required and optional GLESv1 extensions. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> (cherry picked from commit 6b9e4b6c)
-
Chia-I Wu authored
We'd like to add intelInitExtensionsES1 to it later. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> (cherry picked from commit 820789ac)
-
- Oct 24, 2011
-
-
Jeremy Huddleston Sequoia authored
glXMakeCurrent(dpy, None, NULL) would not correctly unbind the context causing subsequent GLX requests to fail in peculiar ways http://xquartz.macosforge.org/trac/ticket/514 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit 5c44c134)
-
Yuanhan Liu authored
Simply generate GL_INVALID_OPERATION error at display list mode. As explained by Brian, we are going to access PBO data at compile time. No need to defer the error at execution time. Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com> Reviewed-by: Brian Paul <brianp@vmware.com> (cherry picked from commit 46d5fb57)
-
Yuanhan Liu authored
Wrap _mesa_unpack_bitmap to handle the case that data is stored in pixel buffer object. This would make calling Bitmap with data stored in PBO by display list work. Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com> Reviewed-by: Brian Paul <brianp@vmware.com> (cherry picked from commit 02b801c1)
-
Yuanhan Liu authored
It seems like a typo. Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com> Reviewed-by: Brian Paul <brianp@vmware.com> (cherry picked from commit 403cf7c5)
-
Yuanhan Liu authored
v2: quote the spec; explicitly exclude the GL_BITMAP case to make code more readable. (comments from Ian) v3: Cast the offset by GLintptr to remove the compile warning(comments from Brian). I also found that I should use _mesa_sizeof_packed_type() instead, as it includes packed pixel type, like GL_UNSIGNED_SHORT_5_6_5. Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com> Reviewed-by: Brian Paul <brianp@vmware.com> (cherry picked from commit 9024d8af)
-
Yuanhan Liu authored
The patch(based on the reading of the emulator) came from while I was trying to fix the oglc pbo texImage.1PBODefaults fail. This case generates a texture with the width and height equal to window's width and height respectively, then try to texture it on the whole window. So, it's exactly one texel for one pixel. And, the min filter and mag filter are GL_LINEAR. It runs with swrast OK, as expected. But it failed with i965 driver. Well, you can't tell the difference from the screen, as the error is quite tiny. From my digging, it seems that there are some tiny error happened while getting tex address. This will break the one texel for one pixel rule in this case. Thus the linear result is taken, with tiny error. This patch would fix all oglc pbo subcase fail with the same issue on both ILK, SNB and IVB. v2: comments from Ian, make the address_round filed assignment consistent. (the sampler is alread memset to 0 by the xxx_update_samper_state caller, so need to assign 0 first) Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com> (cherry picked from commit 76669381)
-
Yuanhan Liu authored
Introuduce a simple function called copy_data to do the image data copy stuff for all the save_CompressedTex*Image function. The function check the NULL data case to avoid some potential segfault. This also would make the code a bit simpler and less redundance. Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com> Reviewed-by: Brian Paul <brianp@vmware.com> (cherry picked from commit e9edcf8b)
-
Yuanhan Liu authored
There is already comments show how to detect a null texture. Fix the code to match the comments. This would fix the oglc divzero(basic.texQOrWEqualsZero) and divzero(basic.texTrivialPrim) test case fail. Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net> (cherry picked from commit 1a662e7c)
-
Yuanhan Liu authored
Trigger GL_INVALID_ENUM error if the face paramter is not a valid value. Trigger GL_INVALID_VALUE error if the GL_SHININESS value is out side [0, ctx->Constant.MaxShiniess]. v2: fix the max shininess value. v3: suggested by Brian, move the face check into glMaterialfv function to reduce code duplicate. Also, refactor the error message. Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com> Signed-off-by: Brian Paul <brianp@vmware.com> (cherry picked from commit a11b4c1e)
-
Yuanhan Liu authored
Accroding the man page, GL_INVALID_VALUE would generated if access has any bits set other than those valid defined bits. Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com> Signed-off-by: Brian Paul <brianp@vmware.com> (cherry picked from commit 099af9e9)
-
Brian Paul authored
(cherry picked from commit 386ec5e8)
-
Yuanhan Liu authored
According the man page, trigger a GL_INVALID_VALUE if size < 0. Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com> Signed-off-by: Brian Paul <brianp@vmware.com> (cherry picked from commit 57b8f13a)
-
Yuanhan Liu authored
According the man page, GL_INVALID_OPERATION should generated if glPixelZoom is executed between the execution of glBegin and the corresponding execution of glEnd. Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com> Signed-off-by: Brian Paul <brianp@vmware.com> (cherry picked from commit 7a9a8bba)
-
Yuanhan Liu authored
According the man page, GL_INVALID_OPERATION should be generated if glIsEnabled is executed betwwen the execution of glBegin and the correspoding execution of glEnd. Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com> Signed-off-by: Brian Paul <brianp@vmware.com> (cherry picked from commit 6a988022)
-