Commit graph

41461 commits

Author SHA1 Message Date
Marek Olšák
cd2cf02139 r300/compiler: apply the texture swizzle to shadow pass and fail values too
Piglit tests:
- glsl-fs-shadow2d-01
- glsl-fs-shadow2d-02
- glsl-fs-shadow2d-03
- fs-shadow2d-red-01
- fs-shadow2d-red-02
- fs-shadow2d-red-03

NOTE: This is a candidate for the stable branches.
(cherry picked from commit 0d96ae8fc7)
2011-04-04 19:14:29 +02:00
Marek Olšák
f3a21be95e r300/compiler: propagate SaturateMode down to the result of shadow comparison
NOTE: This is a candidate for the stable branches.
(cherry picked from commit 2679760834)
2011-04-04 19:14:20 +02:00
Alex Deucher
5a3f1aee64 r600g: add some additional ontario pci ids
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
2011-04-04 11:27:25 -04:00
Alex Deucher
0372db6fa8 r600c: add new ontario pci ids
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
2011-04-04 11:27:09 -04:00
Marek Olšák
868ca30235 r300g: tell the GLSL compiler to lower the continue opcode
NOTE: This is a candidate for the stable branches.
(cherry picked from commit f814dd7a81)
2011-04-03 19:37:43 +02:00
Kenneth Graunke
b39603e008 glsl: Accept precision qualifiers on sampler types, but only in ES.
GLSL 1.30 states clearly that only float and int are allowed, while the
GLSL ES specification's issues section states that sampler types may
take precision qualifiers.

Fixes compilation failures in 3DMarkMobileES 2.0 and GLBenchmark 2.0.

(cherry-picked from commit 8752824f27)
2011-04-02 20:11:10 -07:00
Kenneth Graunke
73f7453318 i965/fs: Fix linear gl_Color interpolation on pre-gen6 hardware.
Civilization 4's shaders make heavy use of gl_Color and don't use
perspective interpolation.  This resulted in rivers, units, trees, and
so on being rendered almost entirely white.  This is a regression
compared to the old fragment shader backend.

Found by inspection (comparing the old and new FS backend code).

References: https://bugs.freedesktop.org/show_bug.cgi?id=32949

(cherry-picked from commit 0c8beb0ab5)
2011-04-02 20:10:40 -07:00
Tom Stellard
a947d9be61 prog_optimize: Fix reallocating registers for shaders with loops
Registers that are used inside of loops need to be considered live
starting with the first instruction of the outermost loop.

https://bugs.freedesktop.org/show_bug.cgi?id=34370

(cherry picked from commit 18dcbd358f)

Reviewed-by: Eric Anholt <eric@anholt.net>
2011-03-31 21:24:32 -07:00
Jerome Glisse
ed4aa47d42 r600g: move user fence into base radeon structure
This avoid any issue when context is free and we still try to
access fence through radeon structure.

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
(cherry picked from commit 63b9790a55)
2011-03-30 11:06:52 +02:00
Michel Dänzer
5bbaf1992c Use proper source row stride when getting depth/stencil texels.
(cherry picked from commit b082e04619)
2011-03-30 10:54:51 +02:00
Benjamin Franzke
71b06c63ce st/dri: Fix surfaceless gl using contexts with previous bound surfaces
ctx->dPriv might be != NULL then draw which is NULL is accessed:

struct dri_drawable *draw = dri_drawable(driDrawPriv);
[..]
if (ctx->dPriv != driDrawPriv) {
      ctx->dPriv = driDrawPriv;
      draw->texture_stamp = driDrawPriv->lastStamp - 1;
}

Cherry-picked from 0acb31be17

Signed-off-by: Jakob Bornecrantz <wallbraker@gmail.com>
2011-03-30 02:26:41 +02:00
Henri Verbeet
7fcaf9ae80 st/mesa: Validate state before doing blits.
Specifically, this ensures things like the front buffer actually exist. This
fixes piglt fbo/fbo-sys-blit and fd.o bug 35483.

Signed-off-by: Henri Verbeet <hverbeet@gmail.com>
(cherry picked from commit 5d7c27f5ec)
2011-03-30 00:53:07 +02:00
Marek Olšák
d464f5908f r300g: fix alpha-test with no colorbuffer
Piglit:
- fbo-alphatest-nocolor

NOTE: This is a candidate for the stable branches.
(cherry picked from commit 226ae9d6c8)
2011-03-24 23:46:28 +01:00
Eric Anholt
78fa94f091 i965: Fix alpha testing when there is no color buffer in the FBO.
We were alpha testing against an unwritten value, resulting in garbage.
(part of) Bug #35073.
(cherry picked from commit a99447314c)
2011-03-24 13:42:18 -07:00
Eric Anholt
1ae33556dd i965: Apply a workaround for the Ironlake "vertex flashing".
This is an awful hack and will hurt performance on Ironlake, but we're
at a loss as to what's going wrong otherwise.  This is the only common
variable we've found that avoids the problem on 4 applications
(CelShading, gnome-shell, Pill Popper, and my GLSL demo), while other
variables we've tried appear to only be confounding.  Neither the
specifications nor the hardware team have been able to provide any
enlightenment, despite much searching.

https://bugs.freedesktop.org/show_bug.cgi?id=29172
Tested by:	Chris Lord <chris@linux.intel.com> (Pill Popper)
Tested by:	Ryan Lortie <desrt@desrt.ca> (gnome-shell)
(cherry picked from commit 1a57717bbe)
2011-03-24 13:40:43 -07:00
Zou Nan hai
c21a44463a i965: bump VS thread number to 60 on SNB
Signed-off-by: Zou Nan hai <nanhai.zou@intel.com>
(cherry picked from commit 6c324777a6)
2011-03-24 13:40:25 -07:00
Ian Romanick
386921cf45 glsl: Only allow unsized array assignment in an initializer
It should have been a tip when the spec says "However, implicitly
sized arrays cannot be assigned to. Note, this is a rare case that
*initializers and assignments appear to have different semantics*."
(empahsis mine)

Fixes bugzilla #34367.

NOTE: This is a candidate for stable release branches.
(cherry picked from commit 85caea29c1)
2011-03-23 18:59:31 -07:00
Ian Romanick
310d85c492 glsl: Use insert_before for lists instead of open coding it
(cherry picked from commit bdb6a6ef83)
2011-03-23 18:59:22 -07:00
Ian Romanick
55d86204f3 linker: Add imported functions to the linked IR
Fixes piglit test glsl-function-chain16 and bugzilla #34203.

NOTE: This is a candidate for stable release branches.
(cherry picked from commit 60f898a90e)
2011-03-23 18:12:55 -07:00
Ian Romanick
da8c178c8b glsl: Add several function / call related validations
The signature list in a function must contain only ir_function_signature nodes.

The target of an ir_call must be an ir_function_signature.

These were added while trying to debug Mesa bugzilla #34203.
(cherry picked from commit 8bbfbb14ee)
2011-03-23 18:12:24 -07:00
Ian Romanick
9dec904ef3 glsl: Function signatures cannot have NULL return type
The return type can be void, and this is the case where a `_ret_val'
variable should not be declared.
(cherry picked from commit 2df56b002d)
2011-03-23 18:12:16 -07:00
Ian Romanick
856a661d2f glsl: Process redeclarations before initializers
If an array redeclaration includes an initializer, the initializer
would previously be dropped on the floor.  Instead, directly apply the
initializer to the correct ir_variable instance and append the
generated instructions.

Fixes bugzilla #34374 and piglit tests glsl-{vs,fs}-array-redeclaration.

NOTE: This is a candidate for stable release branches.  0292ffb8 and
8e6cb9fe are also necessary.
(cherry picked from commit 09a4ba0fc3)
2011-03-23 16:55:08 -07:00
Ian Romanick
f0231a44b9 glsl: Refactor AST-to-HIR code handling variable redeclarations
Some significant edits were made to this patch during cherry picking.
There some fairly major conflicts due to GLSL 1.30 features and
extensions added in master that do not exist in the 7.10 branch.

(cherry picked from commit 8e6cb9fe51)
2011-03-23 16:55:07 -07:00
Ian Romanick
a28cef5e6e glsl: Refactor AST-to-HIR code handling variable initializers
(cherry picked from commit 0292ffb85c)
2011-03-23 16:55:07 -07:00
José Fonseca
1efb7428ed mesa: More glGet* fixes.
glGet(GL_NORMAL_ARRAY) giving potentially wrong results.

Most of glGet(GL_XXX_ARRAY_BUFFER_BINDING) giving totally bogus results.
2011-03-23 17:18:54 +00:00
Chad Versace
b8a077cee0 i965: Fix tex_swizzle when depth mode is GL_RED
Change swizzle from (x000) to (x001).

Signed-off-by: Chad Versace <chad.versace@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
2011-03-22 19:55:05 -07:00
Kenneth Graunke
9ebb904bbd glcpp: Remove trailing contexts from #if rules.
These are now unnecessary.

(cherry picked from commit 09e1bebc25)
2011-03-22 19:55:05 -07:00
Kenneth Graunke
7cf7c966f8 glcpp: Rework lexer to use a SKIP state rather than REJECT.
Previously, the rule deleted by this commit was matched every single
time (being the longest match).  If not skipping, it used REJECT to
continue on to the actual correct rule.

The flex manual advises against using REJECT where possible, as it is
one of the most expensive lexer features.  So using it on every match
seems undesirable. Perhaps more importantly, it made it necessary for
the #if directive rules to contain a look-ahead pattern to make them
as long as the (now deleted) "skip the whole line" rule.

This patch introduces an exclusive start state, SKIP, to avoid REJECTs.
Each time the lexer is called, the code at the top of the rules section
will run, implicitly switching the state to the correct one.

Fixes piglit tests 16384-consecutive-chars.frag and
16385-consecutive-chars.frag.

(cherry picked from commit f20656e944)
2011-03-22 19:44:37 -07:00
José Fonseca
7628e489e4 mesa: Fix typo glGet*v(GL_TEXTURE_COORD_ARRAY_*). 2011-03-22 23:00:13 +00:00
Tom Stellard
d525a1b468 r300/compiler: Use a 4-bit writemask in pair instructions
We now use a 4-bit writemask for all instruction types, which makes it
easier to write generic helper functions to manipulte writemasks.

(cherry picked from commit 9d2ef284bb)
2011-03-18 19:52:14 -07:00
Dave Airlie
d59da64817 r600: don't close fd on failed load
This fd gets passed in from outside, closing it causes the X.org server
to crap out when the driver doesn't identify the chipset.

Signed-off-by: Dave Airlie <airlied@redhat.com>
2011-03-14 07:11:16 +10:00
Marek Olšák
ea26cc8696 st/mesa: fix crash when using both user and vbo buffers with the same stride
If two buffers had the same stride where one buffer is a user one and
the other is a vbo, it was considered to be one interleaved buffer,
resulting in incorrect rendering and crashes.

This patch makes sure that the interleaved buffer is either user or vbo,
not both.
(cherry picked from commit 695cdee678)
2011-03-12 22:10:44 +01:00
Marek Olšák
954787cee1 r300/compiler: remove unused variables
(cherry picked from commit ff8baec5bc)
2011-03-12 22:04:17 +01:00
Marek Olšák
75fd54e7bd r300/compiler: fix equal and notequal shadow compare functions
(cherry picked from commit 4dfcf3c4fe)
2011-03-12 22:03:55 +01:00
Marek Olšák
8453dce232 r300/compiler: saturate Z before the shadow comparison
This fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=31159

NOTE: This is a candidate for the 7.9 and 7.10 branches.
(cherry picked from commit eb1acd1613)
2011-03-12 22:03:41 +01:00
Marek Olšák
e48b0b9032 r300/compiler: do not set TEX_IGNORE_UNCOVERED on r500
The docs say it can be set for direct texture lookups, but even that
causes problems.

This fixes the wireframe bug:
https://bugs.freedesktop.org/show_bug.cgi?id=32688

NOTE: This is a candidate for the 7.9 and 7.10 branches.
(cherry picked from commit 6da4866ffd)
2011-03-12 21:51:28 +01:00
Marek Olšák
3a1b2bb372 r300/compiler: TEX instructions don't support negation on source arguments
This fixes piglit:
- glsl-fs-texture2d-dependent-4

NOTE: This is a candidate for the 7.9 and 7.10 branches.
(cherry picked from commit 1e97b4dd10)
2011-03-12 21:51:17 +01:00
Marek Olšák
38f0e9b651 r300/compiler: Abs doesn't cancel Negate (in the conversion to native swizzles)
NOTE: This is a candidate for the 7.9 and 7.10 branches.
(cherry picked from commit 589d835dfd)
2011-03-12 21:51:05 +01:00
Marek Olšák
aaf7c86b30 r300/compiler: fix translating the src negate bits in pair_translate
(1, -_, ...) was converted to (-1, ...) because of the negation
in the second component.
Masking out the unused bits fixes this.

Piglit:
- glsl-fs-texture2d-branching

NOTE: This is a candidate for the 7.9 and 7.10 branches.
(cherry picked from commit d96305e4fc)
2011-03-12 21:50:53 +01:00
Marek Olšák
c3fcd8af4f r300/compiler: fix the saturate modifier when applied to TEX instructions
This bug can only be triggered if the source texture is either signed or float.
(cherry picked from commit e4707604ab)
2011-03-12 21:50:36 +01:00
Marek Olšák
b5d293e4fd st/mesa: fail to alloc a renderbuffer if st_choose_renderbuffer_format fails
This fixes:
  state_tracker/st_format.c:401:st_pipe_format_to_mesa_format:
  Assertion `0' failed.
(cherry picked from commit fb5d9e1199)

Conflicts:

	src/mesa/state_tracker/st_cb_fbo.c
2011-03-12 21:46:01 +01:00
Marek Olšák
3a02a2bf25 st/mesa: fix crash when DrawBuffer->_ColorDrawBuffers[0] is NULL
This fixes the game Tiny and Big.
(cherry picked from commit 7942e6a5ae)
2011-03-12 21:40:47 +01:00
Brian Paul
3ed9054cc5 docs: add, fix release notes links 2011-03-08 09:16:30 -07:00
Brian Paul
9a5de0895e docs: fill in 7.10.1 release data 2011-03-08 09:16:14 -07:00
Brian Paul
2aebe261aa docs: update news.html with 7.10.1 and 7.9.2 releases 2011-03-08 09:15:56 -07:00
Brian Paul
d7c64d7c36 docs: pull 7.9.2 release notes into 7.10 branch 2011-03-08 09:14:33 -07:00
Ian Romanick
68cdea9fb2 docs: Add 7.10.1 md5sums 2011-03-02 14:14:33 -08:00
Ian Romanick
565caabf40 docs: Add change log to 7.10.1 release notes 2011-03-02 13:54:20 -08:00
Ian Romanick
e4fefc3c32 mesa: set version string to 7.10.1 (final) 2011-03-02 13:49:17 -08:00
Ian Romanick
b0a7492aeb intel: Remove driver date and related bits from renderer string
Not only did this contain lies, it contained lies that wouldn't be
useful even if true.
2011-03-01 13:35:39 -08:00