summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)AuthorFilesLines
2015-03-07meta/TexSubImage: Stash everything other than PIXEL_TRANSFER/store in meta_beginJason Ekstrand1-4/+4
Previously, there were bugs where if the app set a scissor it could affect the area of the texture that was downloaded. There was also potential that the framebuffer SRGB state could affect downloads. This ensures that those will get saved/restored and can't affect the texture download. Cc: 10.5 <mesa-stable@lists.freedesktop.org> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89292 Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit b1ab02d9c0cc11ba8ef4efaba9452d644b6a0811)
2015-03-07i965: Consider scratch writes to have side effects.Matt Turner1-0/+1
We could do better by tracking scratch reads and writes. Cc: 10.5 <mesa-stable@lists.freedesktop.org> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=88793 Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com> (cherry picked from commit da20bf068ef0f816968d9bc4dfea81facf0fd680)
2015-03-07mesa: Correct backwards NULL check.Matt Turner1-1/+1
Cc: "10.4, 10.5" <mesa-stable@lists.freedesktop.org> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> (cherry picked from commit 491d42135ad0e5670756216154f2ba9fc79d4ba7)
2015-03-07mesa: Free memory allocated for luminance in readpixels.Matt Turner1-0/+1
Cc: "10.4, 10.5" <mesa-stable@lists.freedesktop.org> Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Iago Toral Quiroga <itoral@igalia.com> (cherry picked from commit 87109acbed9c9b52f33d58ca06d9048d0ac7a215)
2015-03-07mesa: Indent break statements and add a missing one.Matt Turner1-5/+6
Always indenting break statements makes spotting missing ones easier. Cc: "10.4, 10.5" <mesa-stable@lists.freedesktop.org> Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Iago Toral Quiroga <itoral@igalia.com> (cherry picked from commit 2b2fa1865248c6e3b7baec81c4f92774759b201f)
2015-03-07i965/gs: Check newly-generated GS-out VUE map against correct stageChris Forbes1-1/+1
Previously, we compared our new GS-out VUE map to the existing *VS*-out VUE map, which is bogus. This would mostly manifest as redundant dirty flagging where the GS is in use but the VS and GS output layouts differ; but there is a scary case where we would fail to flag a GS-out layout change if it happened to match the VS-out layout. Signed-off-by: Chris Forbes <chrisf@ijw.co.nz> Cc: "10.5, 10.4" <mesa-stable@lists.freedesktop.org> Reviewed-by: Matt Turner <mattst88@gmail.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=88885 (cherry picked from commit b51ff50a767cc78d678ed3d2c25995f5c4194fea)
2015-03-07i965/vec4: Fix implementation of i2b.Matt Turner1-1/+1
I broke this in commit 2881b123d. I must have misread i2b as b2i. Cc: 10.5 <mesa-stable@lists.freedesktop.org> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=88246 Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> (cherry picked from commit 43ef2657a08f850c5756f28520f2cbe506807f24)
2015-03-07i965/fs/nir: Use emit_math for nir_op_fpowIan Romanick1-1/+1
It appears that all the other instructions that need it already use it. This one just got missed. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com> Cc: "10.5" <mesa-stable@lists.freedesktop.org> (cherry picked from commit b8a1637119249c1d5e76c27d0053360bbb7f4e77)
2015-03-02xmlpool: make sure we ship options.hEmil Velikov1-1/+1
The header is included in ../xmlpool.h. With the latter of which used directly in a number of places in mesa. Note that we can also add it (alongside t_option.h) to noinst_HEADERS, but neither solution fixes the issue that brough us here - namely: Do not regenerate the headers, if it already exists. Cc: "10.5" <mesa-stable@lists.freedesktop.org> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2015-03-02mapi: fix shared-glapi dependency trackingEmil Velikov1-1/+1
I.e. add shared-glapi/glapi_mapi_tmp.h to the SOURCES list. Otherwise there will be no knowledge that the file is required by others for the build. Thus autotools won't pick it up for the distribution tarball. Cc: "10.5" <mesa-stable@lists.freedesktop.org> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2015-03-02mesa: drop Makefile from get_hash.h dependency listEmil Velikov1-1/+1
Not required. Additionally this had the side effect of generating the file, despite it's existence. Cc: "10.5" <mesa-stable@lists.freedesktop.org> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2015-03-02mesa: fix dependency tracking of generated sourcesEmil Velikov1-0/+2
Some of the files generated were not in the SOURCES variable, thus although generated prior to compilation the dependency tracking was incomplete. The latter of which resulted in the files missing from the distribution tarball. Cc: "10.5" <mesa-stable@lists.freedesktop.org> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2015-03-02mesa: rename format_info.c to format_info.hEmil Velikov4-6/+6
The file is auto-generated, and #included by formats.c. Let's rename it to reflect the latter. This will also help up fix the dependency tracking by adding it to the _SOURCES variable, without the side effect of it being compiled (twice). Cc: "10.4, 10.5" <mesa-stable@lists.freedesktop.org> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2015-03-02mesa/main: update .gitignoreEmil Velikov1-3/+1
Drop the no longer present get_es{1,2}.c from the list. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2015-02-27auxilary/os: correct sysctl use in os_get_total_physical_memory()Jonathan Gray1-2/+2
The length argument passed to sysctl was the size of the pointer not the type. The result of this is sysctl calls would fail on 32 bit BSD/Mac OS X. Additionally the wrong pointer was passed as an argument to store the result of the sysctl call. Cc: "10.4, 10.5" <mesa-stable@lists.freedesktop.org> Signed-off-by: Jonathan Gray <jsg@jsg.id.au> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> (cherry picked from commit 7983a3d2e06b0bc16c1a16bddccc7f14fe1f132c)
2015-02-27r600g/sb: treat undefined values like constantsDave Airlie1-2/+2
When we schedule an instructions with undefined value, we eventually will use 0, which is a constant, however sb wasn't taking this into account and creating ops with illegal scalar swizzles. this replaces my fix for op3 in t slots. Reviewed-by: Glenn Kennard <glenn.kennard@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com> (cherry picked from commit e8e4437ed0660b3f1d1912f53d997cf5e25f486d)
2015-02-27i965/skl: Implement WaDisable1DDepthStencilNeil Roberts1-0/+12
Skylake+ doesn't support setting a depth buffer to a 1D surface but it does allow pretending it's a 2D texture with a height of 1 instead. This fixes the GL_DEPTH_COMPONENT_* tests of the copyteximage piglit test (and also seems to avoid a subsequent GPU hang). Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89037 Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (cherry picked from commit 5b29b2922afe2b8167a589fc2896a071fc85b693) Nominated-by: Ian Romanick <idr@freedesktop.org>
2015-02-27pipe-loader: Fix build with dri drivers enabled, and vl state trackers disabledTom Stellard1-1/+5
Configure arguments: ./configure --disable-dri3 --disable-xvmc --enable-opencl --with-gallium-drivers=r300,r600,radeonsi --with-egl-platforms=drm Build error: make[3]: *** No rule to make target `../../../../src/gallium/auxiliary/libgalliumvlwinsys.la', needed by `pipe_r300.la'. Stop. Cc: "10.5" <mesa-stable@lists.freedestkop.org> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> (cherry picked from commit ed07255149d7cffac07615e946289b3d683faa4b)
2015-02-27glsl: Rewrite and fix min/max to saturate optimization.Matt Turner1-29/+46
There were some bugs, and the code was really difficult to follow. We would optimize min(max(x, b), 1.0) into max(sat(x), b) but not pay attention to the order of min/max and also do max(min(x, b), 1.0) into max(sat(x), b) Corrects four shaders from Champions of Regnum that do min(max(x, 1), 10) and corrects rendering of Mass Effect under VMware Workstation. Cc: "10.4 10.5" <mesa-stable@lists.freedesktop.org> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89180 Reviewed-by: Abdiel Janulgue <abdiel.janulgue@linux.intel.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> (cherry picked from commit cb25087c7bd5f1ad2515647278b32d3f07803f77)
2015-02-27glx: Fix returned values of GLX_RENDERER_PREFERRED_PROFILE_MESAAndreas Boll1-6/+30
If the renderer supports the core profile the query returned incorrectly 0x8 as value, because it was using (1U << __DRI_API_OPENGL_CORE) for the returned value. The same happened with the compatibility profile. It returned 0x1 (1U << __DRI_API_OPENGL) instead of 0x2. Internal DRI defines: dri_interface.h: #define __DRI_API_OPENGL 0 dri_interface.h: #define __DRI_API_OPENGL_CORE 3 Those two bits are supposed for internal usage only and should be translated to GLX_CONTEXT_CORE_PROFILE_BIT_ARB (0x1) for a preferred core context profile and GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB (0x2) for a preferred compatibility context profile. This patch implements the above translation in the glx module. v2: Fix the incorrect behavior in the glx module Cc: "10.3 10.4 10.5" <mesa-stable@lists.freedesktop.org> Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> (cherry picked from commit 6d164f65c5a794164d07bc66c1f8f87280514e8c)
2015-02-27common: Fix PBOs for 1D_ARRAY.Laura Ekstrand1-26/+36
Corrects the way that _mesa_meta_pbo_TexSubImage and _mesa_meta_pbo_GetTexSubImage handle 1D_ARRAY textures. Fixes a failure in the Piglit arb_direct_state_access/gettextureimage-targets test. Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com> Tested-by: Laura Ekstrand <laura@jlekstrand.net> Cc: "10.4, 10.5" <mesa-stable@lists.freedesktop.org> (cherry picked from commit 546aba143d13ba3f993ead4cc30b2404abfc0202)
2015-02-27common: Correct PBO 2D_ARRAY handling.Laura Ekstrand1-9/+17
Changes PBO uploads and downloads to use a tall (height * depth) 2D texture for blitting. This fixes the bug where 2D_ARRAY, 3D, and CUBE_MAP_ARRAY textures are not properly uploaded and downloaded. Removes the option to use a 2D ARRAY texture for the PBO during upload and download. This option didn't work because the miptree couldn't be set up reliably. v2: Review from Jason Ekstrand and Neil Roberts: -Delete the depth parameter from create_texture_for_pbo -Abandon the option to create a 2D ARRAY texture in create_texture_for_pbo Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com> Cc: "10.4, 10.5" <mesa-stable@lists.freedesktop.org> (cherry picked from commit ccc5ce6f72c1ec86be4dfcef96c0b51fba0faa6d)
2015-02-27common: Correct texture init for meta pbo uploads and downloads.Laura Ekstrand1-1/+4
This moves the line setting immutability for the texture to after _mesa_initialize_texture_object so that the initializer function will not cancel it out. Moreover, because of the ARB_texture_view extension, immutable textures must have NumLayers > 0, or depth will equal (0-1)=0xFFFFFFFF during SURFACE_STATE setup, which triggers assertions. v2: Review from Kenneth Graunke: - Include more explanation in the commit message. - Make texture setup bug fixes into a separate patch. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com> Cc: "10.4, 10.5" <mesa-stable@lists.freedesktop.org> (cherry picked from commit 06084652fefe49c3d6bf1b476ff74ff602fdc22a)
2015-02-27st/omx/dec/h264: fix picture out-of-order with poc type 0 v2Leo Liu1-0/+5
poc counter should be reset with IDR frame, otherwise there would be a re-order issue with frames before and after IDR v2: add commit message Signed-off-by: Leo Liu <leo.liu@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Cc: "10.4 10.5" <mesa-stable@lists.freedesktop.org> (cherry picked from commit 9c7b343bc0a6aa6065055cbc1c0a891ccc445984)
2015-02-24mesa: Fix error validating args for TexSubImage3DEduardo Lima Mitev1-2/+2
The zoffset and depth values were not being considered when calling error_check_subtexture_dimensions(). Fixes 2 dEQP tests: * dEQP-GLES3.functional.negative_api.texture.texsubimage3d_neg_offset * dEQP-GLES3.functional.negative_api.texture.texsubimage3d_invalid_offset Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Cc: "10.4 10.5" <mesa-stable@lists.freedestkop.org> (cherry picked from commit 2aa71e9485a5a062b1bd2dd8bdc081a8fa4c873d)
2015-02-24egl, wayland: RGB565 format support on Back-bufferVivek Kasireddy1-3/+38
In current code, color format is always hardcoded to __DRI_IMAGE_FORMAT_ARGB8888 when buffer or DRI image is allocated in function calls, get_back_bo and dri2_get_buffers, regardless of current target's color format. This problem may leads to incorrect render pitch calculation, which eventually ends up with wrong offset of pixels in the frame buffer when the image is in different color format from dri surf's, especially with different bpp. (e.g. RGB565-16bpp) Attached code patch simply adds RGB565 and XRGB8888 cases to two functions noted above to resolve the issue. v2: added a case of XRGB8888, format and bpp selection is done via switch-case (not "if-else" anymore) Signed-off-by: Vivek Kasireddy <vivek.kasireddy@intel.com> Signed-off-by: Dongwon Kim <dongwon.kim@intel.com> Reviewed-by: Kristian Høgsberg <krh@bitplanet.net> Cc: "10.5" <mesa-stable@lists.freedesktop.org> (cherry picked from commit 1e96eece300bbd2dd621a4941a4418222bb4c8e5)
2015-02-24i965: Link test programs with gtest before pthreads.Matt Turner1-10/+10
Cc: "10.5" <mesa-stable@lists.freedesktop.org> Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=540962 (cherry picked from commit 0b6d43e329d194b01ab5cd554617f79a13f6669a)
2015-02-24radeonsi: fix point spritesMarek Olšák1-1/+1
Broken by a27b74819ad375e8c0bc88e13f42c951d2b5cd6a. This fix is critical and should be ported to stable ASAP. Cc: 10.5 10.4 <mesa-stable@lists.freedesktop.org> (cherry picked from commit 7820a11e3dea2aca8e2b9b4ed9faf94ff5696990) Squashed with commit radeonsi: fix a warning caused by previous commit Cc: 10.5 10.4 <mesa-stable@lists.freedesktop.org> (cherry picked from commit 050bf75c8bbaa7cad537aabaf8612129edfee3a4)
2015-02-24vbo: fix an unitialized-variable warningMarek Olšák1-0/+1
It looks like a bug to me. Cc: 10.5 10.4 10.3 <mesa-stable@lists.freedesktop.org> Reviewed-by: Brian Paul <brianp@vmware.com> (cherry picked from commit 0feb0b73731cebd1513dd7f4e6cdf6de81edb802)
2015-02-24radeonsi: don't use SQC_CACHES to flush ICACHE and KCACHE on SIMarek Olšák1-18/+11
This reverts 73c2b0d18c51459697d8ec194ecfc4438c98c139. It doesn't seem to be reliable. It's probably missing a wait packet or something, because it's just a register write and doesn't wait for anything. SURFACE_SYNC at least seems to wait until the flush is done. Just guessing. Let's not complicate things and revert this. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=88561 Cc: 10.5 <mesa-stable@lists.freedesktop.org> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit 7692704b144b2aa9a57767a43212ceb5aad6638a)
2015-02-24i965/vec4: Add and use byte-MOV instruction for unpack 4x8.Matt Turner4-2/+21
Previously we were using a B/UB source in an Align16 instruction, which is illegal. It for some reason works on all platforms, except Broadwell. Cc: "10.5" <mesa-stable@lists.freedesktop.org> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=86811 Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> (cherry picked from commit e0137fd6f720e4977466b1760ac02a72c5abceb8)
2015-02-24i965/fs: Consider MOV.SAT to interfere if it has a source modifier.Matt Turner2-4/+52
The saturate propagation pass recognizes that the second instruction below does not interfere with an attempt to propagate the saturate modifier from instruction 3 to 1. 1: add(8) dst0 src0 src1 2: mov.sat(8) dst1 dst0 3: mov.sat(8) dst2 dst0 Unfortunately, we did not consider the case of instruction 2 having a source modifier on dst0. Take for instance: 1: add(8) dst0 src0 src1 2: mov.sat(8) dst1 -dst0 3: mov.sat(8) dst2 dst0 Consider such an instruction to interfere. Increase instruction counts in Anomaly 2, which could be a bug fix depending on the values the first instruction produces. instructions in affected programs: 53228 -> 53934 (1.33%) HURT: 360 Cc: <mesa-stable@lists.freedesktop.org> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> (cherry picked from commit 7f8dd91d166e49d7da98f90d6428dc2705fb96d0)
2015-02-24i965/fs: Use fs_inst::overwrites_reg() in saturate propagation.Matt Turner2-4/+44
This is safer and matches the conditional_mod propagation pass. Cc: <mesa-stable@lists.freedesktop.org> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> (cherry picked from commit 871ad3f08bc34e16fdd728e9a4821b9a83e509f0)
2015-02-24i965/fs: Add unit tests for saturate propagation pass.Matt Turner2-0/+362
Cc: <mesa-stable@lists.freedesktop.org> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> (cherry picked from commit bf3389ec49a158e0b66db8e038d801eacabd20f1)
2015-02-24st/mesa: fix sampler view reference counting bug in glDraw/CopyPixelsBrian Paul1-6/+9
Use pipe_sampler_view_reference() instead of ordinary assignment. Also add a new sanity check assertion. Fixes piglit gl-1.0-drawpixels-color-index test crash. But note that the test still fails. Cc: "10.4, 10.5" <mesa-stable@lists.freedesktop.org> Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu> (cherry picked from commit 62a8883f32f8a4c8c7d85390d4b17986e4018edf)
2015-02-24swrast: fix multiple color buffer writingBrian Paul1-11/+14
If a fragment program wrote to more than one color buffer, the first fragment color got replicated to all dest buffers. This fixes 5 piglit FBO tests, including fbo-drawbuffers-arbfp. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=45348 Cc: "10.4, 10.5" <mesa-stable@lists.freedesktop.org> Reviewed-by: Eric Anholt <eric@anholt.net> (cherry picked from commit 89c96afe3c0acf8f2fccaf02da02945afe8ba5f3)
2015-02-24auxiliary/vl: honour the DRI2PROTO_CFLAGSEmil Velikov1-0/+1
Otherwise for non-default installations the build will fail to find the headers and error out. Cc: "10.5" <mesa-stable@lists.freedesktop.org> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> (cherry picked from commit 8a71fd8d49c6a086f9b7697bca3b1f3ae035121a)
2015-02-24auxiliary/vl: Build vl_winsys_dri.c only when needed.Emil Velikov1-0/+4
With commit c39dbfdd0f7(auxiliary/vl: bring back the VL code for the dri targets) we did not fully consider users of dri-swrast alone. Thus we ended up trying to compile the dri2 specific code on platform which lack it - Cygwin for example. Cc: "10.5" <mesa-stable@lists.freedesktop.org> Reported-by: Jon TURNEY <jon.turney@dronecode.org.uk> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk> (cherry picked from commit dd7b6670a29ff3ed48ba44a9fecd1890363d914f)
2015-02-24Revert "radeon/llvm: enable unsafe math for graphics shaders"Michel Dänzer1-4/+0
This reverts commit 0e9cdedd2e3943bdb7f3543a3508b883b167e427. It caused the grass to disappear in The Talos Principle. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89069 Cc: "10.5 10.4" <mesa-stable@lists.freedesktop.org> Reviewed-by: Tom Stellard <thomas.stellard@amd.com> Reviewed-by: Marek Olšák <marek.olsak@amd.com> (cherry picked from commit 4db985a5fa9ea985616a726b1770727309502d81)
2015-02-24i965: Prefer Meta over the BLT for BlitFramebuffer.Kenneth Graunke1-7/+7
There's some debate about whether we should use Meta or BLORP, but either should run circles around the BLT engine. In particular, this means that Gen8+ will use the 3D engine for blits, like we do on Gen6-7. Improves performance in "copypixrate -blit -back" (from Mesa demos) by 232.037% +/- 3.15795% (n=10) on Broadwell GT3e. v2: Rebase on Laura's changes. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Matt Turner <mattst88@gmail.com> Cc: "10.5" <mesa-stable@lists.freedesktop.org> (cherry picked from commit d523fefa756eef9c7a2c0d91cf4c2df10b89ed2a)
2015-02-24Make _mesa_swizzle_and_convert argument types in .c match those in .hAlan Coopersmith1-2/+2
Caused Solaris Studio compilers to fail to build with errors about incompatible function redefinitions. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Cc: "10.5" <mesa-stable@lists.freedesktop.org> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Brian Paul <brianp@vmware.com> (cherry picked from commit b7ce7c00e35ceb3518d932359ed52cacd6679acb)
2015-02-24Use __typeof instead of typeof with Solaris Studio compilersAlan Coopersmith1-3/+3
While the C compiler accepts typeof, C++ requires __typeof. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=86944 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Cc: "10.5" <mesa-stable@lists.freedesktop.org> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Brian Paul <brianp@vmware.com> (cherry picked from commit 4671dca0eecf7dbf3e0d0a13111813756722d57d)
2015-02-24Avoid fighting with Solaris headers over isnormal()Alan Coopersmith1-1/+1
When compiling in C99 or C++11 modes, Solaris defines isnormal() as a macro via <math.h>, which causes the function definition to become too mangled to compile. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Cc: "10.5" <mesa-stable@lists.freedesktop.org> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Brian Paul <brianp@vmware.com> (cherry picked from commit d602fbd861e2c3c5570b55f0839361a6f8bd32c7)
2015-02-24Remove extraneous ; after DECL_TYPE usageAlan Coopersmith1-33/+33
The macro is defined to provide a trailing ; so this caused the expansion to end in ";;" which made the Solaris Studio compilers issue warnings for every line of: "builtin_type_macros.h", line 113: Warning: extra ";" ignored. for every file that included the header, filling build logs with thousands of useless warnings. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Cc: "10.5" <mesa-stable@lists.freedesktop.org> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Brian Paul <brianp@vmware.com> (cherry picked from commit 815b3bd096a3eab9f00f9270d45a6885d73180e9)
2015-02-24glsl: Reduce memory consumption of copy propagation passes.Kenneth Graunke2-6/+25
opt_copy_propagation and opt_copy_propagation_elements create new ACP and Kill sets each time they enter a new control flow block. For if blocks, they also copy the entire existing ACP set contents into the new set. When we exit the control flow block, we discard the new sets. However, we weren't freeing them - so they lived on until the pass finished. This can waste a lot of memory (57MB on one pessimal shader). This patch makes the pass allocate ACP entries using this->acp as the memory context, and Kill entries out of this->kill. It also steals kill entries when moving them from the inner kill list to the parent. It then frees the lists, including their contents. v2: Move ralloc_free(this->acp) just before this->acp = orig_acp (suggested by Eric Anholt). Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Cc: "10.5 10.4" <mesa-stable@lists.freedesktop.org> (cherry picked from commit 76960a55e6656bb0022e9c31ae7542010da130e3)
2015-02-24main: Fixed _mesa_GetCompressedTexImage_sw to copy slices correctly.Laura Ekstrand1-2/+2
Previously array textures were not working with GetCompressedTextureImage, leading to failures in the test arb_direct_state_access/getcompressedtextureimage.c. Tested-by: Laura Ekstrand <laura@jlekstrand.net> Reviewed-by: Brian Paul <brianp@vmware.com> Cc: "10.4, 10.5" <mesa-stable@lists.freedesktop.org> (cherry picked from commit 92163482bda87216764edc0beca3ca090678038d)
2015-02-24radeonsi: fix a crash if a stencil ref state is set before a DSA stateMarek Olšák1-4/+8
+ minor indentation fixes Discovered by Axel Davy. This can't be reproduced with any app, because all state trackers set a DSA state first. Cc: 10.5 10.4 10.3 <mesa-stable@lists.freedesktop.org> Reviewed-by: Axel Davy <axel.davy@ens.fr> (cherry picked from commit 2ead74888a70481aa40b5b6ede42279e1917e66c)
2015-02-24mesa: fix AtomicBuffer typo in _mesa_DeleteBuffersMarek Olšák1-1/+1
Cc: 10.5 10.4 10.3 <mesa-stable@lists.freedesktop.org> Reviewed-by: Brian Paul <brianp@vmware.com> (cherry picked from commit e8625a29fe0942af2876f0684b06c6ed01939227)
2015-02-24radeonsi: small fix in SPI stateMarek Olšák1-2/+4
Cc: 10.5 10.4 <mesa-stable@lists.freedesktop.org> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> (cherry picked from commit a27b74819ad375e8c0bc88e13f42c951d2b5cd6a)
2015-02-24meta: Fix saving the results of the current occlusion queryNeil Roberts1-7/+10
When restoring the current state in _mesa_meta_end it was previously trying to copy the on-going sample count of the current occlusion query into the new query after restarting it so that the driver will continue adding to the previous value. This wouldn't work for two reasons. Firstly, the query might not be ready yet so the Result member will usually be zero. Secondly the saved query is stored as a pointer to the query object, not a copy of the struct, so it is actually restarting the exact same object. Copying the result value is just copying between identical addresses with no effect. The call to _mesa_BeginQuery will have always reset it back to zero. This patch fixes it by making it actually wait for the query object to be ready before grabbing the previous result. The downside of doing this is that it could introduce a stall but I think this situation is unlikely so it might not matter too much. A better solution might be to introduce a real suspend/resume mechanism to the driver interface. This could be implemented in the i965 driver by saving the depth count multiple times like it does in the i945 driver. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=88248 Reviewed-by: Carl Worth <cworth@cworth.org> Cc: "10.5" <mesa-stable@lists.freedesktop.org> (cherry picked from commit bb77745681e179b53ea64da7bc1987b57643b7b0)
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-18 16:16:31 +0000