Jeremy Huddleston
7cdf969527
apple: Change from XExtDisplayInfo to struct glx_display
...
Fixes regression introduced by: ab434f6b76 and
c356f5867f
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-06-05 20:52:14 -04:00
Ben Skeggs
1d24e6ec1d
dri/nouveau: fix gnome-shell segfault
...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
2011-06-06 10:17:59 +10:00
Jeremy Huddleston
279e471750
apple: Rename GLXcontext
...
Fixes regression introduced by: c356f5867f
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-06-05 18:22:47 -04:00
Jeremy Huddleston
b7f0ed8444
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>
2011-06-05 18:19:59 -04:00
Jeremy Huddleston
488d6c739f
apple: Re-add driContext and do_destroy
...
Fixes regression introduced by: c491e585e4
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-06-05 18:10:55 -04:00
Jeremy Huddleston
22613d1670
apple: Rename GLXcontext
...
Fixes regression introduced by: c356f5867f
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-06-05 18:10:55 -04:00
Jeremy Huddleston
bb621cb61e
apple: Rename __GLcontextModes to struct glx_config
...
Fixes regression introduced by: 6ddf66e923
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-06-05 18:07:05 -04:00
Jeremy Huddleston
4c9bab78a1
apple: Rename glcontextmodes.[ch] to glxconfig.[ch]
...
Fixes regression introduced by: 65d98e2577
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-06-05 18:03:45 -04:00
Jeremy Huddleston
8e89d0bea7
apple: Update GL specs
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-06-05 18:03:44 -04:00
Eric Anholt
e8ea8793e3
meta: Don't do sRGB encode for framebuffer blits on sRGB-enabled framebuffers.
...
Fixes fbo-srgb-blit.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=35373
Reviewed-by: Brian Paul <brianp@vmware.com>
2011-06-05 11:29:00 -07:00
Eric Anholt
a513bee2f2
meta: Don't do srgb to linear decode when blitting srgb textures.
...
Fixes the GL_SRGB8_ALPHA8 -> GL_RGBA8 blits in fbo-srgb-blit.c
Reviewed-by: Brian Paul <brianp@vmware.com>
2011-06-05 11:28:59 -07:00
Christian König
b4fa7db656
[g3dvl] split quant matrix out of picture info
2011-06-05 18:59:57 +02:00
Christian König
c4a168819d
[g3dvl] rename map/unmap to begin/end frame
...
mapping and unmapping of buffers is just an implementation detail.
begining and ending an frame is much more descriptive
2011-06-05 17:53:48 +02:00
Christian König
7e1fbb3603
[g3dvl] remove unused and dublicate fields from picture structure
2011-06-05 17:07:17 +02:00
Christian König
c6c2ef0709
[g3dvl] use a vertex element instead of the instance id
...
Enable this change permanently
2011-06-05 16:39:10 +02:00
Christian König
bdfe77444d
st/mesa: some more merge fixes
2011-06-05 01:28:44 +02:00
Christian König
129a3c1cf0
r600g: some merge fixes
2011-06-05 00:59:58 +02:00
Christian König
1eb957bb41
Merge remote-tracking branch 'origin/master' into pipe-video
2011-06-05 00:11:41 +02:00
Christian König
a6c76c8a90
[g3dvl] use a vertex element instead of the instance id
2011-06-04 23:54:46 +02:00
Christian König
f82cfe1eb4
Revert "Merge remote-tracking branch 'mareko/r300g-draw-instanced' into pipe-video"
...
This reverts commit 10370b752c , reversing
changes made to ded2a9a628 .
2011-06-04 12:55:43 +02:00
Eric Anholt
164108e3db
glx: Fix use-before-null-check in dri2InvalidateBuffers().
...
The compiler used our dereference here to skip the NULL check below.
Fixes window resize in "jconsole -J-Dsun.java2d.opengl=True" under
OpenJDK 6.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=37766
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2011-06-03 16:03:34 -07:00
Eric Anholt
836a595594
i965: Drop remaining strict conformance fallback for GL_POINT_SMOOTH.
...
We actually could do this in hardware in the fragment shader using
gl_PointCoord and the point's size.
2011-06-03 16:03:18 -07:00
Eric Anholt
e9868979c5
i965: Drop strict conformance fallback for GL_LINE_STIPPLE.
...
We implement line stipples, just not *quite* correctly. We have a
piglit testcase to use when we want to fix it, if we do. Until then,
don't lie to our test suites.
2011-06-03 16:03:18 -07:00
Eric Anholt
d313346db6
i965: Drop strict conformance fallback for GL_LINE_SMOOTH.
...
We do have hardware antialised lines. If we care, we should actually
fix them to be conformant (or as close as possible) instead of using
this knob to fool testcases using swrast.
For some interesting reading on the state of GL_*_SMOOTH across
several drivers, see:
http://homepage.mac.com/arekkusu/bugs/invariance/HWAA.html
2011-06-03 16:03:18 -07:00
Eric Anholt
d8b733643d
i965: Drop strict conformance fallback for GL_POLYGON_SMOOTH.
...
From my reading of the GL 2.1 spec, no antialiasing is strictly
conformant for polygon smoothing. Yes, it's absurd, but then,
hardware doesn't support this so maybe it's not so absurd.
2011-06-03 16:03:18 -07:00
Eric Anholt
3f05374574
i965: Drop INTEL_CONFORMANCE=2 fallback code.
...
This was just a duplicate of no_rast=true driconf option, which is
relatively standard across drivers.
2011-06-03 16:03:18 -07:00
Paul Berry
6491e9593d
glsl: fixed printing of structure constants.
...
ir_print_visitor::visit(ir_constant *) was failing to index properly
into ir->type->fields.structure, so the first field name was being
reprinted for every field in the structure.
Signed-off-by: Brian Paul <brianp@vmware.com>
2011-06-03 12:48:49 -06:00
Paul Berry
26b566e19c
AST dump: fixed printing of conditionals.
...
ast_expression::print() had an incorrect index into the subexpressions
array, so (a ? b : c) was being incorrectly rendered as (a ? b : b).
Signed-off-by: Brian Paul <brianp@vmware.com>
2011-06-03 11:07:00 -06:00
Christian König
10370b752c
Merge remote-tracking branch 'mareko/r300g-draw-instanced' into pipe-video
2011-06-03 10:47:56 +02:00
Dave Airlie
4077336fc7
r600g: move spi update to only when states change.
...
This updates the spi state after ps/vs binding or rasteriser state
change.
Signed-off-by: Dave Airlie <airlied@redhat.com>
2011-06-03 15:27:00 +10:00
Dave Airlie
1dbcb83881
cso: move cso hashes to a more table driven scheme
...
this removes a bad branch pain in the hash table lookup fn.
Signed-off-by: Dave Airlie <airlied@redhat.com>
2011-06-03 15:26:59 +10:00
Dave Airlie
970726dd6f
u_prim: convert u_trim_pipe_prim to table driven.
...
This makes this function not be an always miss for the branch predictor.
Noticed using cachegrind, makes a minor difference to gears numbers on r600g.
Signed-off-by: Dave Airlie <airlied@redhat.com>
2011-06-03 15:26:59 +10:00
Dave Airlie
de0adb691f
r600g: make conv pipe prim table driven.
...
This is a lot more branch predictor friendly, it actually
showed up in cachegrind profiles.
Signed-off-by: Dave Airlie <airlied@redhat.com>
2011-06-03 15:26:59 +10:00
Brian Paul
aaeb9a8216
mesa: fix typo (s/GLGL/GLSL/)
2011-06-02 21:49:49 -06:00
Brian Paul
52f6e79b7c
mesa: 80-column wrapping
2011-06-02 21:49:49 -06:00
Brian Paul
9653acc52a
mesa: consolidate glGetUniform code
2011-06-02 21:49:49 -06:00
Brian Paul
bbce18c647
mesa: refactor/consolidate uniform lookup code
2011-06-02 21:49:49 -06:00
Brian Paul
230c71d9ee
mesa: add some minor fixes for geometry shaders
2011-06-02 21:49:49 -06:00
Brian Paul
b03296c1e9
dri: add missing files from 873379a881
2011-06-02 18:27:10 -06:00
Pierre-Eric Pelloux-Prayer
09201cc7a0
mesa: add implementation of glDrawElementsInstancedBaseVertex
...
Signed-off-by: Brian Paul <brianp@vmware.com>
2011-06-02 17:55:48 -06:00
Pierre-Eric Pelloux-Prayer
0dae94610e
glapi: regenerated files
...
Signed-off-by: Brian Paul <brianp@vmware.com>
2011-06-02 17:55:13 -06:00
Brian Paul
898f4c5133
glapi: add glDrawElementsInstancedBaseVertex() function to xml
...
Signed-off-by: Brian Paul <brianp@vmware.com>
2011-06-02 17:54:55 -06:00
Johannes Obermayr
873379a881
dri/nouveau: Fix build with --enable-shared-dricore.
...
- Based on the work of Себастьян Gliţa Κατινα <cglita@yahoo.com>
- Split Makefile.template into Makefile.defines and Makefile.targets
- Adapt other drivers to new situation
- Fixes https://bugs.freedesktop.org/show_bug.cgi?id=35441
Signed-off-by: Brian Paul <brianp@vmware.com>
2011-06-02 17:21:26 -06:00
Brian Paul
a9c5efb111
r300: remove MIN3 macro, already defined in macros.h
2011-06-02 17:21:26 -06:00
Dave Airlie
51d0892ee2
r600g: sampler and texture state doesn't need a range/block.
...
These are handled separately in the winsys, so don't need the calculations
done at this point. this manifested as a crash in point-sprite,
Thanks to XoD on #radeon for pointing it out.
Signed-off-by: Dave Airlie <airlied@redhat.com>
2011-06-03 08:54:25 +10:00
Adam Jackson
e09e5cb7d8
glx: Remove (unused, broken) fastImageUnpack fast path
...
Reviewed-by: Brian Paul <brianp@vmware.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
2011-06-02 15:37:22 -04:00
Adam Jackson
776a2a5447
glx: Fix another case of using req outside of the display lock
...
Reviewed-by: Brian Paul <brianp@vmware.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
2011-06-02 15:37:21 -04:00
Marek Olšák
bddf275db4
softpipe: add a better fake implementation of fences
...
The flush function, when asked for, should not return a NULL fence.
NULL can only be returned if fences are not implemented, and st/mesa
doesn't call any of the fence functions if it receives a NULL fence
(because some drivers don't even set the fence hooks).
ARB_sync is exposed if fence_finish is set.
2011-06-02 16:50:46 +02:00
Brian Paul
f62e1f41b4
util: faster logbase2
2011-06-02 08:45:27 -06:00
Benjamin Bellec
bab3b4a758
mesa: faster logbase2
...
With minor clean-ups by Brian Paul.
Signed-off-by: Brian Paul <brianp@vmware.com>
2011-06-02 08:31:20 -06:00