summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-08-04winsys/sw/android: set bo usage correctlyandroid-gingerbread-7.11Chia-I Wu1-10/+3
2011-08-04targets/egl-static: print the driver usedChia-I Wu1-1/+9
2011-08-04android: fix a possible building issueChih-Wei Huang2-6/+6
2011-08-04egl_dri2: set log proc upon initializationChia-I Wu2-28/+24
2011-08-04android: use different LOG_TAG for st/egl and egl_dri2Chia-I Wu2-3/+4
2011-08-03android: use r300g's copy of r300 compilerChia-I Wu4-88/+40
2011-08-03r300g: copy the compiler from r300cMarek Olšák69-25/+17038
What a beast. r300g doesn't depend on files from r300c anymore, so r300c is now left to its own fate. BTW 'make test' can be invoked from the gallium/r300 directory to run some compiler unit tests. (cherry picked from commit 1c2c4ddbd1e97bfd13430521e5c09cb5ce8e36e6)
2011-08-03android: rename libmesa_classic_egl to libmesa_egl_dri2Chia-I Wu3-3/+3
2011-08-03android: rename libmesa_classic_mesa to libmesa_dricoreChia-I Wu3-3/+3
2011-08-03android: avoid '..' in LOCAL_SRC_FILESChia-I Wu5-10/+42
We do not want the objects files to pollute the out/ directory. This also has the (very nice) side effect that we no longer need to list libmesa twice in LOCAL_STATIC_LIBRARIES in order to simulate a --start-group/--end-group pair.
2011-08-03android: drop the 'c' suffix of classic driversChia-I Wu2-8/+8
As Chad Versace suggests, they are not how the developers call them.
2011-08-03Revert "android: fix depth/stencil with i915c/i965c"Chia-I Wu2-34/+0
This reverts commit 5800b7612d258946a1416176c7672b4d7b95fd89. It should not be needed after switching to egl_dri2.
2011-08-02android: add a missing file after merging 7.11Chia-I Wu1-0/+1
2011-08-02Merge commit 'mesa-7.11' into android-gingerbread-7.11Chia-I Wu50-598/+1916
2011-08-02st/egl: add a missing includeChia-I Wu1-0/+1
Reported by cwhuang.
2011-07-31mesa: Bump version to 7.11 (final)Ian Romanick2-2/+2
2011-07-31docs: More bits of 7.11 release notesIan Romanick1-1/+258
2011-08-01android: build glsl_compilerChia-I Wu1-0/+19
2011-08-01android: remove unneeded header includesChia-I Wu1-0/+2
2011-07-31darwin: Use machine/endian.h to determine endiannessJeremy Huddleston1-0/+9
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit 5b3c7199830b8eaac4df2f8c3f10d0e89b4bd5c5)
2011-07-31Fix PPC detection on darwinJeremy Huddleston1-2/+2
Fixes regression introduced by 7004582c1894ede839c44e292b413fe4916d7e9e Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit e737a99a6fbafe3ba4b5175eea25d1598dbeb9d8)
2011-07-31android: libdrm_radeon is not needed for r600gChia-I Wu1-1/+1
2011-07-31winsys/sw/android: use HAL formatsChia-I Wu1-14/+5
2011-07-31st/egl: add buffer preserving support to AndroidChia-I Wu1-4/+66
2011-07-31st/egl: improve buffer cache for AndroidChia-I Wu1-28/+70
2011-07-30egl_dri2: add pbuffer support to Android platformChia-I Wu1-52/+68
2011-07-30egl_android: removed in favor of egl_dri2Chia-I Wu7-1480/+7
2011-07-30egl_dri2: add support for AndroidChia-I Wu6-5/+771
Ported from egl_android.
2011-07-30egl_dri2: properly destroy contextsChia-I Wu1-1/+18
2011-07-30st/egl: use HAL formats for Android backendChia-I Wu1-26/+15
2011-07-28Merge remote-tracking branch 'origin/7.11' into 7.11Ian Romanick2-2/+2
2011-07-28mesa: Bump version to 7.11-rc4Ian Romanick2-2/+2
2011-07-28r600g: fix vs export countVadim Girlin2-2/+2
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=39572 Signed-off-by: Vadim Girlin <vadimgirlin@gmail.com>
2011-07-28i965: Remove the now unused intel_renderbuffer::draw_offset field.Kenneth Graunke2-2/+0
The previous commit removed the last use of this field. Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> (cherry picked from commit f73caddd3339d284556036d031ab30ce8057a510)
2011-07-28i965: Check actual tile offsets in Gen4 miptree workaround.Kenneth Graunke1-2/+17
The purpose of the (irb->draw_offset & 4095) != 0 check was to ensure that we don't have XYy offsets into a tile, since Gen4 hardware doesn't support that. However, it's insufficient: there are cases where draw_offset & 4095 is 0 but we still have a Y-offset. This leads to an assertion failure in brw_update_renderbuffer_surface with tile_y != 0. Instead, simply call intel_renderbuffer_tile_offsets to compute the actual X/Y offsets and check if either are non-zero. This makes both the workaround and the assertion check the same things. Fixes piglit test fbo-generatemipmap-formats, and should also fix bugs #34009 and #39487. NOTE: This is a candidate for stable release branches. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=34009 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=39487 Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Chad Versace <chad@chad-versace.us> Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> (cherry picked from commit 15c0bc5eefc89bec537e412c02965f201fb1c011)
2011-07-28i965/gen4: Fix message parameter loading for 1D TXD sampling.Kenneth Graunke1-2/+4
We were neglecting to load dvdx and dvdy. v is not optional. Fixes glslparsertests tex-grad-0[12345].frag on Broadwater/Crestline. (We still need an execution test using sampler1D.) NOTE: This is a candidate for the 7.11 branch. Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> (cherry picked from commit 3e1fd13f605f16e8b48f3a9b71910a3c66eb84b5)
2011-07-28st/mesa: fix the texture format in st_context_teximageFredrik Höglund1-1/+1
Commit 1a339b6c71ebab6e1a64f05b2e133022d3bbcd15 made st_ChooseTextureFormat map GL_RGBA with type GL_UNSIGNED_BYTE to PIPE_FORMAT_A8B8G8R8_UNORM. The image format for ARGB pixmaps is PIPE_FORMAT_B8G8R8A8_UNORM however. This mismatch caused the texture to be recreated in st_finalize_texture. NOTE: This is a candidate for the 7.11 branch. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=39209 Signed-off-by: Fredrik Höglund <fredrik@kde.org> Reviewed-by: Stéphane Marchesin <marcheu@chromium.org> Signed-off-by: Brian Paul <brianp@vmware.com>
2011-07-28mesa: Ensure that r300 compiler files only appear once in the tarballsIan Romanick1-3/+1
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Tested-by: Jeremy Huddleston <jeremyhu@apple.com> Cc: Andreas Radke <a.radke@arcor.de>
2011-07-28mesa: Bump version to 7.11-rc3Ian Romanick2-2/+2
2011-07-28mesa: Use --dereference to avoid symlinks in tarballsIan Romanick1-2/+2
2011-07-28i965/fs: Fix MRT drawing since the m0->m2 move for shader debug.Eric Anholt1-1/+2
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> (cherry picked from commit 3daa2d97eb13f41de4cbab9301a167be85d48642)
2011-07-28i965: Fix many of the trivial WebGL demos that broke due to IB optimization.Eric Anholt1-0/+1
The index buffer state emit only occurred if there was an IB in place and we were in either a new batch or a new IB state. But because we only flagged new IB state if IB state changed from the last IB state we calculated, we could simply never emit IB state after batchbuffer wraps if the first draw didn't use the IB and we didn't actually change the IB. Fixes piglit glx-multi-context-ib-1. (cherry picked from commit 818db3848bfaa002d0e7cf6b9b615a31eb82ba25)
2011-07-28i965: Emit texture cache flushes on gen6 along with render cache flushes.Eric Anholt1-0/+1
It turns out that internally the texture cache gets flushed in a couple of cases, particularly around 2D operations mixed with 3D. In almost all cases one of those happens between rendering to an FBO-attached texture and rendering from that texture. However, as of the next patch, glean tfbo (and the new fbo-flushing-2 test) would manage to get stale texture values because one of those flushes didn't occur. The intention of this code was always to get the render cache cleared and ready to be used from the sampler cache (and it does on <= gen4), so this just catches gen5 up. This patch was also tested to fix fbo-flushing on gen7. (cherry picked from commit 185868c9c2e6a31a7313df2dbe29490547b65f61)
2011-07-28i965: vs optimization fix: Check val.{negate,abs} in accumulator_contains()Paul Berry1-0/+3
When emitting a MAC instruction in a vertex shader, brw_vs_emit() calls accumulator_contains() to determine whether the accumulator already contains the appropriate addend; if it does, then we can avoid emitting an unnecessary MOV instruction. However, accumulator_contains() wasn't checking the val.negate or val.abs flags. As a result, if the desired value was the negation, or the absolute value, of what was already in the accumulator, we would generate an incorrect shader. Fixes piglit test vs-refract-vec4-vec4-float. Tested on Gen5 and Gen6. Reviewed-by: Eric Anholt <eric@anholt.net> (cherry picked from commit d92463d5dc42aca09a54588c322fc60582cf9131)
2011-07-28i965/gen7: Fix shadow sampling in the old brw_wm_emit backend.Kenneth Graunke1-4/+11
On Ivybridge, the shadow comparitor goes in the first slot, rather than at the end. It's not necessary to send u, v, and r. Fixes tests texturing/texdepth and glean/fbo. NOTE: This is a candidate for the 7.11 branch. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> (cherry picked from commit 572f6318954f31fcf3d396ac5df8e9eff3f37c74)
2011-07-28i965/fs: Clear result before visiting shadow comparitor and LOD info.Kenneth Graunke1-0/+10
Commit 53c89c67f33639afef951e178f93f4e29acc5d53 ("i965: Avoid generating MOVs for assignments of expressions.") added the line "this->result = reg_undef" all over the code. Unfortunately, since Eric developed his patch before I landed Ivybridge support, he missed adding it to fs_visitor::emit_texture_gen7() after rebasing. Furthermore, since I developed TXD support before Eric's patch, I neglected to add it to the gradient handling when I rebased. Neglecting to set this causes the visitor to use this->result as storage rather than generating a new temporary. These missing statements resulted in the same register being used to store several different values. Fixes the following piglit tests on Ivybridge: - glsl-fs-shadow2dproj.shader_test - glsl-fs-shadow2dproj-bias.shader_test NOTE: This is a candidate for the 7.11 branch. Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net> (cherry picked from commit 156cef0fbacf242e8fc67e39ab964e5f8f3739cb)
2011-07-28glsl: Treat ir_dereference_array of non-var as a constant for loweringIan Romanick1-2/+8
Previously the code would just look at deref->array->type to see if it was a constant. This isn't good enough because deref->array might be another ir_dereference_array... of a constant. As a result, deref->array->type wouldn't be a constant, but deref->variable_referenced() would return NULL. The unchecked NULL pointer would shortly lead to a segfault. Instead just look at the return of deref->variable_referenced(). If it's NULL, assume that either a constant or some other form of anonymous temporary storage is being dereferenced. This is a bit hinkey because most drivers treat constant arrays as uniforms, but the lowering pass treats them as temporaries. This keeps the behavior of the old code, so this change isn't making things worse. Fixes i965 piglit: vs-temp-array-mat[234]-index-col-rd vs-temp-array-mat[234]-index-col-row-rd vs-uniform-array-mat[234]-index-col-rd vs-uniform-array-mat[234]-index-col-row-rd Reviewed-by: Eric Anholt <eric@anholt.net> (cherry picked from commit 156f85336f80d542569f0b0182bd27c7f3218e70)
2011-07-28i965: When emitting a src/dst read of an output, keep the swizzle and negIan Romanick1-3/+16
Fixes i965 piglit vs-varying-array-mat[234]-row-rd. Reviewed-by: Eric Anholt <eric@anholt.net> (cherry picked from commit 1d3f09f15998c60326bf6c53a8d32c82496264ae)
2011-07-28i965: When emitting a src/dst write of an output, keep the write maskIan Romanick1-1/+5
Fixes i965 piglit: vs-varying-array-mat[234]-col-row-wr vs-varying-array-mat[234]-index-col-row-wr vs-varying-array-mat[234]-index-row-wr vs-varying-array-mat[234]-row-wr vs-varying-mat[234]-col-row-wr vs-varying-mat[234]-row-wr Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (cherry picked from commit 337e2dfad0bcd567755272271abd2593a1d0fd1f)
2011-07-28prog_optimize: Set unused regs to PROGRAM_UNDEFINED after CMP->MOV conversionIan Romanick1-0/+9
Leaving the unused registers with other values caused assertion failures and other problems in places that blindly iterate over all sources. brw_vs_emit.c:1381: get_src_reg: Assertion `c->regs[file][index].nr != 0' failed. Fixes i965 piglit: vs-uniform-array-mat[234]-col-row-rd vs-uniform-array-mat[234]-index-col-row-rd vs-uniform-array-mat[234]-index-row-rd vs-uniform-mat[234]-col-row-rd Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Eric Anholt <eric@anholt.net> (cherry picked from commit fbeb68e880318808f90c779cd3f8b8c4160eecf8)