Jeremy Huddleston
70d5758479
apple: Package applegl source into MesaLib tarball
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit e5d241ddb2 )
2011-06-13 23:10:41 -07:00
Jeremy Huddleston
72b8f19fa6
darwin: Define GALLIUM_DRIVERS_DIRS in darwin config
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit d563009cd1 )
2011-06-13 23:10:41 -07:00
Jeremy Huddleston
e004ac273d
apple: Fix build failures in applegl_glx.c
...
See https://bugs.freedesktop.org/show_bug.cgi?id=29162
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
This commit squashes three cherry-picks:
(cherry picked from commit 5d35343d12 )
(cherry picked from commit 7c5f37c032 )
(cherry picked from commit 2ee5272e16 )
2011-06-13 23:10:41 -07:00
Jeremy Huddleston
9cbc705e83
apple: Build darwin using applegl rather than indirect
...
This reverts portions of 6849916170 that caused
the darwin config to fail to build due to missing implementations in that
commit.
See https://bugs.freedesktop.org/show_bug.cgi?id=29162
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 1885cf27c9 )
2011-06-13 23:10:41 -07:00
Jeremy Huddleston
858db8cd4e
glx: Dead code removal
...
Remove a redundant ifndef GLX_USE_APPLEGL
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 3843bbcb4c )
2011-06-13 23:10:40 -07:00
Jeremy Huddleston
d8802cd242
apple: ifdef out come glapi-foo on darwin
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 8593bb32ea )
2011-06-13 23:10:40 -07:00
Jeremy Huddleston
7c4cc8d2b9
apple: Change from XExtDisplayInfo to struct glx_display
...
Fixes regression introduced by: ab434f6b76 and
c356f5867f
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 7cdf969527 )
2011-06-13 23:10:40 -07:00
Jeremy Huddleston
a6a5772250
apple: Rename GLXcontext
...
Fixes regression introduced by: c356f5867f
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 279e471750 )
2011-06-13 23:10:40 -07:00
Jeremy Huddleston
9bcc214159
apple: Rename _gl_context_modes_find_visual to glx_config_find_visual
...
Fixes regression introduced by: 6ddf66e923
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit b7f0ed8444 )
2011-06-13 23:10:39 -07:00
Jeremy Huddleston
e03abf70cd
apple: Re-add driContext and do_destroy
...
Fixes regression introduced by: c491e585e4
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 488d6c739f )
2011-06-13 23:10:39 -07:00
Jeremy Huddleston
0c6fbf66cd
apple: Rename GLXcontext
...
Fixes regression introduced by: c356f5867f
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 22613d1670 )
2011-06-13 23:10:39 -07:00
Jeremy Huddleston
14b9e91d01
apple: Rename __GLcontextModes to struct glx_config
...
Fixes regression introduced by: 6ddf66e923
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit bb621cb61e )
2011-06-13 23:10:38 -07:00
Jeremy Huddleston
ff7e6622fc
apple: Rename glcontextmodes.[ch] to glxconfig.[ch]
...
Fixes regression introduced by: 65d98e2577
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 4c9bab78a1 )
2011-06-13 23:10:38 -07:00
Jeremy Huddleston
bde5310339
apple: Manually edit gl.spec to match mesa 7.9 ProgramParameters4dvNV
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-06-13 23:10:37 -07:00
Jeremy Huddleston
4f362e0494
apple: Update GL specs
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit 8e89d0bea7 )
2011-06-13 22:59:04 -07:00
Kenneth Graunke
5408ccb09f
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,
as well as a regression in the Meego Tablet UX.
(cherry-picked from 45e8e6c6b1 )
2011-05-25 11:17:41 -07:00
José Fonseca
203624128c
mesa: Fix GetVertexAttrib* inside display lists.
...
GetVertexAttrib*{,ARB} is no longer aliased to the NV calls.
This fixes tracing yofrankie with apitrace, given it requires accurate
results from GetVertexAttribiv*.
NOTE: This is a candidate for the stable branches.
2011-05-12 14:19:15 +01:00
Tom Stellard
ea95bf7d89
r300/compiler: Fix incorrect presubtract conversion
...
ADD instructions with constant swizzles can't be converted to
presubtract operations.
(cherry picked from commit 0fa81d6d05 )
2011-04-16 14:23:04 -07:00
Tom Stellard
b8050add56
r300/compiler: Fix vertex shader MAD instructions with constant swizzles
...
(cherry picked from commit d8361400b7 )
2011-04-05 09:37:20 -07:00
Marek Olšák
4633054b8b
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:35 +02:00
Marek Olšák
897e464a5d
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:15 +02:00
Marek Olšák
0140b830af
r300g: tell the GLSL compiler to lower the continue opcode
...
NOTE: This is a candidate for the stable branches.
(cherry picked from commit f814dd7a81 )
Conflicts:
src/gallium/drivers/r300/r300_screen.c
2011-04-03 19:43:36 +02:00
Tom Stellard
9e2c9cdf48
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:39:57 -07:00
Marek Olšák
e3dcb53e6e
u_blitter: remove invalid assertion
2011-03-30 02:19:32 +02:00
Henri Verbeet
6b46754bc0
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:18 +02:00
Marek Olšák
7397c034ac
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:39:43 +01:00
José Fonseca
39149172c8
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:19:30 +00:00
José Fonseca
c8bd053d3a
mesa: Fix typo glGet*v(GL_TEXTURE_COORD_ARRAY_*).
2011-03-22 23:01:01 +00:00
Marek Olšák
7272f8fb18
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:11:52 +01:00
Marek Olšák
c91d217ff7
r300/compiler: remove unused variables
...
(cherry picked from commit ff8baec5bc )
2011-03-12 22:04:20 +01:00
Marek Olšák
e2baddb653
r300/compiler: fix equal and notequal shadow compare functions
...
(cherry picked from commit 4dfcf3c4fe )
2011-03-12 22:03:59 +01:00
Marek Olšák
20c7067257
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:46 +01:00
Marek Olšák
ca76f4f6aa
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:34 +01:00
Marek Olšák
c7305375d1
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:21 +01:00
Marek Olšák
dea5e972ff
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:10 +01:00
Marek Olšák
c198d29fbe
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:59 +01:00
Marek Olšák
90292b8001
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:42 +01:00
Marek Olšák
6ea13078fb
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:18 +01:00
Marek Olšák
48d44713f9
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:52 +01:00
Brian Paul
351814a21c
docs: fill in 7.9.2 release date
2011-03-08 09:19:13 -07:00
Ian Romanick
a6909b6bd3
docs: Add 7.9.2 md5sums
2011-03-02 14:20:27 -08:00
Ian Romanick
7e9d853665
docs: Add change log to 7.9.2 release notes
2011-03-02 14:18:05 -08:00
Ian Romanick
ca5cf9bf66
mesa: set version string to 7.9.2 (final)
2011-03-02 13:48:22 -08:00
Ian Romanick
dfae3ffa0f
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.
(cherry picked from commit b0a7492aeb )
2011-03-02 13:47:41 -08:00
Ian Romanick
2b41289691
docs: Clean up bug fixes list
...
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.
2011-03-01 13:22:02 -08:00
Ian Romanick
42c3e00bdb
docs: Update 7.9.2 release notes for recent cherry picks
2011-03-01 13:16:53 -08:00
Cyril Brulebois
0ebbfa4335
Point to bugs.freedesktop.org rather than bugzilla.freedesktop.org
...
Suggested by a freedesktop.org admin.
Signed-off-by: Cyril Brulebois <kibi@debian.org>
(cherry picked from commit d252db7af1 )
2011-03-01 12:57:23 -08:00
Brian Paul
fc5889a528
docs: updated environment variable list
...
(cherry picked from commit 1bf9954bb4 )
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2011-03-01 12:57:07 -08:00
Sam Hocevar
a5b6d8ec4d
docs: fix glsl_compiler name
...
(cherry picked from commit fde4943688 )
2011-03-01 12:54:21 -08:00
Sam Hocevar
6eb1f39b55
docs: add glsl info
...
(cherry picked from commit 3e8fb54fb8 )
2011-03-01 12:54:05 -08:00