| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
| |
|
|
|
|
|
|
| |
Not only did this contain lies, it contained lies that wouldn't be
useful even if true.
(cherry picked from commit b0a7492aebeb4517346f0da2362d6991a7385b59)
|
|
|
|
|
|
| |
All the unnumbered bugs are first. These are followed by numbered
bugs sorted by bug number. This is analogous to 8aabb1bc on the 7.10
branch.
|
| |
|
|
|
|
|
|
|
| |
Suggested by a freedesktop.org admin.
Signed-off-by: Cyril Brulebois <[email protected]>
(cherry picked from commit d252db7af1370246c76b46f4b9e66b352879bd9b)
|
|
|
|
|
|
| |
(cherry picked from commit 1bf9954bb44e47670c8805078f78b5444e97c18d)
Signed-off-by: Ian Romanick <[email protected]>
|
|
|
|
| |
(cherry picked from commit fde49436881e64cc9fd838761cea3d6718832449)
|
|
|
|
| |
(cherry picked from commit 3e8fb54fb8940d015dcc4631cb84255228b1ad9e)
|
|
|
|
|
|
|
|
|
|
| |
Before populating the vertex buffer attribute pointer (VB->AttribPtr[]),
convert vertex data in GL_FIXED format to GL_FLOAT.
Fixes bug: http://bugs.freedesktop.org/show_bug.cgi?id=34047
NOTE: This is a candidate for the 7.9 and 7.10 branches.
(cherry picked from commit a231ac23f41a38cf9bde80bab4cb6aa8821d4895)
|
|
|
|
|
|
| |
NOTE: This is a candidate for the 7.9 and 7.10 branches.
(cherry picked from commit 4c1dc1c4d772b06578567f14419fdd4f27843825)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Previously the SNE and SEQ instructions would calculate the partial
result to the destination register. This would cause problems if the
destination register was also one of the source registers.
Fixes piglit tests glsl-fs-any, glsl-fs-struct-equal,
glsl-fs-struct-notequal, glsl-fs-vec4-operator-equal,
glsl-fs-vec4-operator-notequal.
NOTE: This is a candidate for the 7.9 and 7.10 branches.
(cherry picked from commit 53b8b6884355da3737d1ff714f1fadc69d1745e4)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Previously a register would be marked as available if any component
was written. This caused shaders such as this:
0: TEX TEMP[0].xyz, INPUT[14].xyyy, texture[0], 2D;
1: MUL TEMP[1], UNIFORM[0], TEMP[0].xxxx;
2: MAD TEMP[2], UNIFORM[1], TEMP[0].yyyy, TEMP[1];
3: MAD TEMP[1], UNIFORM[2], TEMP[0].zzzz, TEMP[2];
4: ADD TEMP[0].xyz, TEMP[1].xyzx, UNIFORM[3].xyzx;
5: TEX TEMP[1].w, INPUT[14].xyyy, texture[0], 2D;
6: MOV TEMP[0].w, TEMP[1].wwww;
7: MOV OUTPUT[2], TEMP[0];
8: END
to produce incorrect code such as this:
BEGIN
DCL S[0]
DCL T_TEX0
R[0] = MOV T_TEX0.xyyy
U[0] = TEXLD S[0],R[0]
R[0].xyz = MOV U[0]
R[1] = MUL CONST[0], R[0].xxxx
R[2] = MAD CONST[1], R[0].yyyy, R[1]
R[1] = MAD CONST[2], R[0].zzzz, R[2]
R[0].xyz = ADD R[1].xyzx, CONST[3].xyzx
R[0] = MOV T_TEX0.xyyy
U[0] = TEXLD S[0],R[0]
R[1].w = MOV U[0]
R[0].w = MOV R[1].wwww
oC = MOV R[0]
END
Note that T_TEX0 is copied to R[0], but the xyz components of R[0] are
still expected to hold a calculated value.
Fixes piglit tests draw-elements-vs-inputs, fp-kill, and
glsl-fs-color-matrix. It also fixes Meego bugzilla #13005.
NOTE: This is a candidate for the 7.9 and 7.10 branches.
(cherry picked from commit a04582739e77b58cea9e2aa523109e878bf90b6a)
|
|
|
|
|
|
|
| |
Plugs a memory leak when compiling shaders with user defined structures.
NOTE: This is a candidate for the 7.9 and 7.10 branches.
(cherry picked from commit eb639349e289a6b8be06a54f5e9e0ce18c71d511)
|
|
|
|
|
|
|
|
|
|
| |
Arrays are zero based. If the highest element accessed is 6, the
array needs to have 7 elements.
Fixes piglit test glsl-fs-implicit-array-size-03 and bugzilla #34198.
NOTE: This is a candidate for the 7.9 and 7.10 branches.
(cherry picked from commit 25b36e8ff81a9c951085d6dd802a7534db476f5a)
|
|
|
|
|
|
|
| |
'dpy' was being checked for null *after* it was already used once.
Also add a null check for psc, and drop gc's redundant initialization.
(cherry picked from commit b5dc40710d0e5edffb9f673dfbf26df4d0043eef)
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Track variables, functions, and types during parsing. Use this
information in the lexer to return the currect "type" for identifiers.
Change the handling of structure constructors. They will now show up
in the AST as constructors (instead of plain function calls).
Fixes piglit tests constructor-18.vert, constructor-19.vert, and
constructor-20.vert. Also fixes bugzilla #29926.
NOTE: This is a candidate for the 7.9 and 7.10 branches.
(cherry picked from commit 884215894493bdbc55abd567c121c9df06ae3bc7)
|
|
|
|
|
|
|
|
|
|
| |
This requires lexical disambiguation between variable and type
identifiers (as most C compilers do).
Signed-off-by: Keith Packard <[email protected]>
NOTE: This is a candidate for the 7.9 and 7.10 branches.
(cherry picked from commit f4b812e1a661448cf4b624f283c949a54b52e9d5)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fixes regression: https://bugs.freedesktop.org/show_bug.cgi?id=34160
Commit e7c1f058d18f62aa4871aec623f994d7b68cb8c1 disabled constant-folding
when division-by-zero occured. This was a mistake, because the spec does
allow division by zero. (From section 5.9 of the GLSL 1.20 spec: Dividing
by zero does not cause an exception but does result in an unspecified
value.)
For floating-point division, the original pre-e7c1f05 behavior is
reinstated.
For integer division, constant-fold 1/0 to 0.
Signed-off-by: Ian Romanick <[email protected]>
(cherry picked from commit 62c8c773334c1b0cdd484997a4ccec8945713f8c)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
From section 5.9 of the GLSL 1.20 spec:
The operator modulus (%) is reserved for future use.
From section 5.8 of the GLSL 1.20 spec:
The assignments modulus into (%=), left shift by (<<=), right shift by
(>>=), inclusive or into ( |=), and exclusive or into ( ^=). These
operators are reserved for future use.
The GLSL ES 1.00 spec and GLSL 1.10 spec have similiar language.
Fixes bug:
https://bugs.freedesktop.org//show_bug.cgi?id=33916
Fixes Piglit tests:
spec/glsl-1.00/compiler/arithmetic-operators/modulus-00.frag
spec/glsl-1.00/compiler/assignment-operators/modulus-assign-00.frag
spec/glsl-1.10/compiler/arithmetic-operators/modulus-00.frag
spec/glsl-1.10/compiler/assignment-operators/modulus-assign-00.frag
spec/glsl-1.20/compiler/arithmetic-operators/modulus-00.frag
spec/glsl-1.20/compiler/assignment-operators/modulus-assign-00.frag
(cherry picked from commit 82f994f3860ca05ff5550f32844b0f523d40b9ef)
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
For example, this now raises an error:
#define XXX 1 / 0
Fixes bug: https://bugs.freedesktop.org//show_bug.cgi?id=33507
Fixes Piglit test: spec/glsl-1.10/preprocessor/modulus-by-zero.vert
NOTE: This is a candidate for the 7.9 and 7.10 branches.
(cherry picked from commit fd1252ab67abb1ea351195e192429f292667a8a2)
|
|
|
|
|
| |
See table 6.7 on page 347 of the OpenGL 3.0 specification.
(cherry picked from commit 09e15ac76a6efb17148467671508f171658765d9)
|
|
|
|
|
|
|
| |
This has probably existed since e5e34ab18eeaffa465 or so.
NOTE: This is a candidate for the 7.9 and 7.10 branches.
(cherry picked from commit dfdb9fda826bb6c5dac2c55d9efcd1644a0dd2b9)
|
|
|
|
|
|
|
|
|
| |
Previously we'd happily compile GLSL 1.30 shaders on any driver. We'd
also happily compile GLSL 1.10 and 1.20 shaders in an ES2 context.
This has been a long standing FINISHME in the compiler.
NOTE: This is a candidate for the 7.9 and 7.10 branches
(cherry picked from commit 14880a510a1a288df0778395097d5a52806abfb0)
|
|
|
|
|
| |
NOTE: This is a candidate for the 7.9 and 7.10 branches
(cherry picked from commit e5e34ab18eeaffa465094f6281dfe293b84376db)
|
|
|
|
|
| |
...and remove egg from face.
(cherry picked from commit 2fb0aebd4a248d2a0725099cd5646253c30c1dc3)
|
|
|
|
| |
(cherry picked from commit 790ff232e2607a83e6207d06900a5e3de613d161)
|
|
|
|
| |
(cherry picked from commit 3d028024e581b05f71f0be915657c2c105885de6)
|
|
|
|
| |
(cherry picked from commit dde3270c19143b42a55a93e1e85bb24194462671)
|
|
|
|
|
|
|
|
|
| |
Drivers should override the default range/precision info as needed.
No drivers do this yet.
Signed-off-by: Ian Romanick <[email protected]>
(cherry picked from commit 3ee60a3558a3546b3c3a0a9732d384afcf02994a)
|
|
|
|
|
|
| |
Core mesa has gained support for GL_ARB_ES2_compatibility. Make GLES
generated dispatch table use them.
(cherry picked from commit a4a5a9a5ce255e34ba92396dacd997f7c6f96462)
|
|
|
|
|
| |
Fixes piglit arb_es2_compatibility-shadercompiler
(cherry picked from commit 4620de7eeae18f313436936088d235a99b7bc11d)
|
|
|
|
|
|
|
|
| |
Fixes piglit arb_es2_compatibility-maxvectors.
Signed-off-by: Ian Romanick <[email protected]>
(cherry picked from commit 8395f206a86b3700fc5f8eefc4d9b55e7e150d25)
|
|
|
|
|
|
| |
These are ARB_ES2_compatibility float variants of the core double
entrypoints. Fixes arb_es2_compatibility-depthrangef.
(cherry picked from commit e12c4faf7ef1246fd7c3a9d9dc30130a6675c3b4)
|
|
|
|
|
|
|
|
|
| |
Fixes no-op dispatch warning in piglit
arb_es2_compatibility-releaseshadercompiler.c.
Signed-off-by: Ian Romanick <[email protected]>
(cherry picked from commit 7b987578a94008e28daa5cacf68ee37566a27be8)
|
|
|
|
|
|
| |
(cherry picked from commit 9c6954fc9d254e0d6dc9bc7aac5badee04fe0f9b)
Signed-off-by: Ian Romanick <[email protected]>
|
|
|
|
| |
This is not a cherry pick, but it matches 841ad6bf (and ac06d610).
|
|
|
|
| |
(cherry picked from commit 8560cb939bda27b75baca33294754d6bf7b7bc91)
|
|
|
|
|
|
|
| |
Based commit 19418e921 from master. Chad's extension rework series,
of which 19418e921 is part, wasn't cherry picked to 7.9 because there
were too many conflicts. Most of the conflicts were caused by
extensions that were removed in 7.10.
|
|
|
|
|
|
|
|
|
| |
Without this, X doesn't start with UMS on r300g.
NOTE: This is a candidate for the 7.9 and 7.10 branches.
Signed-off-by: Paulo Zanoni <[email protected]>
Signed-off-by: Brian Paul <[email protected]>
|
|
|
|
| |
This is a candidate for 7.9 and 7.10
|
|
|
|
|
|
|
|
|
|
|
| |
sw clears were being used and not getting the correct offsets in the span
code.
also not emitting correct offsets for CB draws to texture levels.
(I've no idea why I'm playing with r100).
This is a candidate for 7.9 and 7.10
|
|
|
|
| |
(cherry picked from commit 3633e1f538e42ac04700aa98b48e3157b3406c14)
|
| |
|
|
|
|
| |
This was already done in the 7.10 branch and master.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Needs to track this ourself since because we get into a race condition with
the dri_util.c code on make current when rendering to the front buffer.
This is what happens:
Old context is rendering to the front buffer.
App calls MakeCurrent with a new context. dri_util.c sets
drawable->driContextPriv to the new context and then calls the driver make
current. st/dri make current flushes the old context, which calls back into
st/dri via the flush frontbuffer hook. st/dri calls dri loader flush
frontbuffer, which calls invalidate buffer on the drawable into st/dri.
This is where things gets wrong. st/dri grabs the context from the dri
drawable (which now points to the new context) and calls invalidate
framebuffer to the new context which has not yet set the new drawable as its
framebuffers since we have not called make current yet, it asserts.
(cherry picked from commit 94ccc31ba4f64ac480137fd90f1ded44d2072f6e)
Conflicts:
src/gallium/state_trackers/dri/common/dri_context.c
|
| |
|
| |
|