- Oct 08, 2012
-
-
Ian Romanick authored
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
-
Reviewed-by: Matt Turner <mattst88@gmail.com> (cherry picked from commit d68e337c)
-
Anuj Phogat authored
This is a squash for the following 7 commits. The first introduces the functionality, and the remaining six fix various bugs. Patch 1: _mesa_meta_GenerateMipmap: Support all texture targets by generating shaders at runtime glsl path of _mesa_meta_GenerateMipmap() function would require different fragment shaders depending on the texture target. This patch adds the code to generate appropriate fragment shader programs at run time. Fixes https://bugs.freedesktop.org/show_bug.cgi?id=54296 V2: Removed the code for integer textures as ARB is planning to disallow automatic mipmap generation for integer textures. Now using ralloc_asprintf in setup_glsl_generate_mipmap(). NOTE: This is a candidate for stable branches. Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com> Reviewed-by: Brian Paul <brianp@vmware.com> (cherry picked from commit 299acac8) Patch 2: _mesa_meta_GenerateMipmap: Generate separate shaders for glsl 120 / 130 glsl version of _mesa_meta_GenerateMipmap() would require separate shaders for glsl 120 and 130. V2: Removed the code for integer textures as ARB is planning to disallow automatic mipmap generation for integer textures. NOTE: This is a candidate for stable branches. Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com> Reviewed-by: Brian Paul <brianp@vmware.com> (cherry picked from commit 15bf3103) Patch 3: meta: Add on demand compilation of per target shader programs A call to glGenerateMipmap() follows the generation of a relevant shader program in setup_glsl_generate_mipmap(). To support all texture targets and to avoid compiling shaders everytime, per target shader programs are compiled on demand and saved for the next call. Fixes float-texture(mipmap.manual): See Comment 6: https://bugs.freedesktop.org/show_bug.cgi?id=54296 NOTE: This is a candidate for stable branches. Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com> Reviewed-by: Brian Paul <brianp@vmware.com> (cherry picked from commit eb1d87fb) Patch 4: meta: make mem_ctx non-global. I can't see any external users, and this is a global symbol, Reviewed-by: Matt Turner <mattst88@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com> (cherry picked from commit 36639ec6) Patch 5: meta: Remove unsafe global mem_ctx pointer NOTE: This is a candidate for the 9.0 branch. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com> (cherry picked from commit ab097dde) Patch 6: meta: Rearrange shader creation in setup_glsl_generate_mipmap The diff looks weird, but this moves the code from the first 'if (ctx->Const.GLSLVersion < 130)' block down into the second block. It also moves some variable decalarations closer to their use. NOTE: This is a candidate for the 9.0 branch. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com> (cherry picked from commit 3308c079) Patch 7: meta: Don't use GLSL 1.30 shader on OpenGL ES 2 Fixes GLES2 CoverageGL conformance test. NOTE: This is a candidate for the 9.0 branch. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com> (cherry picked from commit 0242381f)
-
- Oct 06, 2012
-
-
Marek Olšák authored
Somehow I only hit this issue with my latest libdrm changes. This won't be needed with DB texturing. NOTE: This is a candidate for the 9.0 branch. (cherry picked from commit 9dfca930)
-
- Oct 05, 2012
-
-
Brian Paul authored
A compressed texture image size doesn't have to be a multiple of the compressed block size (only sub-images do). Fixes issues when building compressed mipmaps because we often wind up with non-block-size images for the higher mipmap levels. Fixes https://bugs.freedesktop.org/show_bug.cgi?id=55445 Note: This is a candidate for the stable branches. Reviewed-by: Eric Anholt <eric@anholt.net> Tested-by: Sven Arvidsson <sa@whiz.se> (cherry picked from commit df4a88ac)
-
Anuj Phogat authored
From SandyBridge PRM, volume 2 Part 1, section 12.2.3, BLEND_STATE: DWord 1, Bit 30 (AlphaToOne Enable): "If Dual Source Blending is enabled, this bit must be disabled" Note: This is a candidate for stable branches. Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com> Reviewed-by: Eric Anholt <eric@anholt.net> (cherry picked from commit ea0d0887)
-
Kenneth Graunke authored
The idea here is to not flag _NEW_VARYING_VP_INPUTS when shaders (either GLSL or ARB vp/fp) are in use. If either TNL or TexEnv programs are active, at least one stage is using fixed function. On Pineview, fixes 20 Piglit, 60 oglconforms, and 7 ES 1.1 conformance tests, as well as missing textures in Xonotic. These were all regressions since commit fb4a34e6. NOTE: This is a candidate for the 9.0 branch. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=49127 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=54807 Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> (cherry picked from commit 7fa0f10c)
-
Paul Berry authored
This function is only present in GLES1 and in the OpenGL compatibility profile. Fixes the following "make check" failure: [----------] 1 test from DispatchSanity_test [ RUN ] DispatchSanity_test.GLES2 Mesa warning: couldn't open libtxc_dxtn.so, software DXTn compression/decompression unavailable dispatch_sanity.cpp:122: Failure Value of: table[i] Actual: 0x4de54e Expected: (_glapi_proc) _mesa_generic_nop Which is: 0x41af72 i = 321 [ FAILED ] DispatchSanity_test.GLES2 (4 ms) [----------] 1 test from DispatchSanity_test (4 ms total) NOTE: This is a candidate for stable release branches. Reviewed-by: Oliver McFadden <oliver.mcfadden@linux.intel.com> Tested-by: Oliver McFadden <oliver.mcfadden@linux.intel.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> (cherry picked from commit 8f0b81bf)
-
The EGL_NOK_swap_region2 spec states that the rectangles are specified with a bottom-left origin within a surface coordinate space also with a bottom left origin, so this patch ensures the rectangles are flipped before passing them on to dri2_copy_region. Fixes piglit's egl-nok-swap-region test. Tested-by: Matt Turner <mattst88@gmail.com> (cherry picked from commit 0a523a88)
-
Matt Turner authored
(cherry picked from dd4fde8f)
-
Tom Stellard authored
Fixes build bug introduced by cebbdd4a (cherry picked from commit 2baaa5c7)
-
- Oct 04, 2012
-
-
Tom Stellard authored
Hopefully, this will fix all the parallel make problems people have been having. (cherry picked from commit cebbdd4a)
-
- Oct 03, 2012
-
-
(cherry picked from commit 837f06b4) The only symbols that need to be public (those in intel_screen.c that the loader looks for) are already marked public. Saves 100k of compiled driver size. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
-
Matt Turner authored
(cherry picked from commit 523c0152)
-
Matt Turner authored
(cherry picked from commit 24ded898)
-
Matt Turner authored
(cherry picked from commit 1762ec28) Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=399813 https://bugs.freedesktop.org/show_bug.cgi?id=53179
-
Matt Turner authored
(cherry picked from commit 4cfff721)
-
Matt Turner authored
(cherry picked from commit 36284027)
-
Matt Turner authored
(cherry picked from commit 55d45efd)
-
Matt Turner authored
(cherry picked from commit 340637d5)
-
Matt Turner authored
(cherry picked from commit 381d120b)
-
Matt Turner authored
(cherry picked from commit d2872b56)
-
Matt Turner authored
(cherry picked from commit 8746f641)
-
Matt Turner authored
(cherry picked from commit 710a90cc)
-
Matt Turner authored
(cherry picked from commit 814345f5) Conflicts: src/mapi/glapi/gen/gl_x86-64_asm.py src/mapi/glapi/gen/gl_x86_asm.py
-
Matt Turner authored
(cherry picked from commit b6651ae6) Conflicts: src/mesa/main/tests/Makefile.am
-
Matt Turner authored
I think libtool should be handling this for us, but the build fails for Jordan because libdricommon (a static library, which uses expat) appears before -lexpat on the linker command. Reviewed-by: Jordan Justen <jordan.l.justen@intel.com> Tested-by: Jordan Justen <jordan.l.justen@intel.com> (cherry picked from commit 31ab61ca) Conflicts: src/mesa/drivers/dri/i965/Makefile.am
-
Oliver McFadden authored
This reverts commit 610910a6. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=55523 Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
-
Oliver McFadden authored
This reverts commit 85cd3040. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=55523 Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
-
Matt Turner authored
rebase failure in 7da12426. (cherry picked from commit 159ca32f)
-
- Oct 01, 2012
-
-
Brian Paul authored
If the destination texture image doesn't exist we'd hit an assertion (or crash in a release build). The piglit/s3tc-errors test hits this. This has already been fixed in master by the error checking code consolidation. Note: This is a candidate for the 8.0 branch.
-
- Sep 30, 2012
-
-
These were recently added to the Makefiles. (cherry picked from commit e78ebbc5)
-
Marek Olšák authored
NOTE: This is a candidate for the stable branches. (cherry picked from commit 96f50d0c)
-
Marek Olšák authored
NOTE: This is a candidate for the stable branches. (cherry picked from commit fd5c5384)
-
Marek Olšák authored
Not sure if this is the best way to fix it. NOTE: This is a candidate for the stable branches. (cherry picked from commit 836325bf)
-
- Sep 28, 2012
-
-
Kenneth Graunke authored
In commit 091eb15b, Jordan changed get_temp_image_type() to use _mesa_get_format_datatype() instead of returning GL_FLOAT. That has several possible return values: GL_FLOAT, GL_INT, GL_UNSIGNED_INT, GL_SIGNED_NORMALIZED, and GL_UNSIGNED_NORMALIZED. We do want to use GL_INT/GL_UNSIGNED_INT for integer formats. However, we want to continue using GL_FLOAT for the normalized fixed-point types. There isn't any code in pack.c to handle GL_(UN)SIGNED_NORMALIZED. Fixes oglconform's fboarb advanced.blit.copypix, which was regressed by commit 091eb15b. NOTE: This is a candidate for the 9.0 branch. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=53573 Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> (cherry picked from commit 3767b25b)
-
Emma Anholt authored
This failed when all the uploads to occur were uniform-type vertex data (like glColor4f being active across a DrawArrays), because it would upload 1 element instead of 1 element per vertex. There was no citation for how this code helped any particular application, and it breaks ETQW, so just remove it. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=47170 NOTE: This is a candidate for the 9.0 and 8.0 branches. Reviewed-and-tested-by: Kenneth Graunke <kenneth@whitecape.org> (cherry picked from commit 0334e8dc)
-
Kenneth Graunke authored
GL_TEXTURE_1D, GL_TEXTURE_3D, GL_TEXTURE_RECTANGLE, and GL_TEXTURE_GEN_S/T/R/Q don't exist in ES 1 contexts, so any meta ops that used _mesa_meta_begin with MESA_META_TEXTURE would trigger GL errors. One such operation is _mesa_meta_Clear(). On ES 1, we want to disable GL_TEXTURE_GEN_STR_OES instead. Fixes the ES1 conformance test miplin.c, which was regressed by commit 08be1d28. NOTE: This is a candidate for the 9.0 branch. v2: Also blacklist GL_TEXTURE_3D, per Brian's comment. v3: Disable GL_TEXTURE_GEN_STR_OES, per Ian's comment. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=54297 Reviewed-by: Brian Paul <brianp@vmware.com> [v1] Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> (cherry picked from commit 679c93ff)
-
Matt Turner authored
NOTE: This is a candidate for the 9.0 branch. Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=839060 https://bugs.gentoo.org/show_bug.cgi?id=435152 Reviewed-by: Adam Jackson <ajax@redhat.com> (cherry picked from commit 9ed00075)
-
Matt Turner authored
NOTE: This is a candidate for the 9.0 branch. Reviewed-by: Adam Jackson <ajax@redhat.com> (cherry picked from commit 7da12426)
-