Brian Paul
c7f5c9a3dc
Merge branch '7.8'
...
Conflicts:
src/mesa/state_tracker/st_gen_mipmap.c
2010-04-28 10:10:51 -06:00
Brian Paul
40dcbb87a9
softpipe: use consistant names for local vars
2010-04-28 10:07:23 -06:00
Brian Paul
331c01ea4d
progs/demos: added code to test compressed mipmap generation (disabled)
2010-04-28 10:07:23 -06:00
Brian Paul
347f783606
gallium: remove trailing comma
2010-04-28 10:07:23 -06:00
Brian Paul
608cf0c9f7
gallium/util: convert //-style comments
2010-04-28 10:07:23 -06:00
Brian Paul
443fe5e57c
gallium/util: convert //-style comments
2010-04-28 10:07:23 -06:00
Brian Paul
7b640f9f70
st/mesa: fix incorrect RowStride computation
...
Fixes incorrect stride when getting a compressed tex image.
2010-04-28 10:06:08 -06:00
Brian Paul
56f99ee640
st/mesa: fill in stImage->level in st_generate_mipmap()
...
Before, this field was always zero for all the new mipmap levels.
Fixes problems with glGetTexImage() from a generated mipmap.
2010-04-28 10:05:06 -06:00
Jakob Bornecrantz
6fc532ae05
Merge branch '7.8'
2010-04-28 16:27:51 +01:00
Jakob Bornecrantz
ef9a8fcb1b
glx: Fix build
2010-04-28 16:25:28 +01:00
Jakob Bornecrantz
e42d84eaba
glx: Fix build
2010-04-28 16:19:41 +01:00
Jakob Bornecrantz
fe0fe67aaf
configure.ac: Print some llvm info
2010-04-28 16:06:17 +01:00
Micah Fedke
9cfaaa291f
egl: dri2 driver error output
...
This patch amends the error output string for the case where the
dri2 egl driver could not open the dri dev node.
Signed-off-by: Brian Paul <brianp@vmware.com >
2010-04-28 07:26:01 -06:00
Brian Paul
1fa7789e82
Merge branch '7.8'
...
Conflicts:
src/glx/dri2_glx.c
src/glx/glx_pbuffer.c
2010-04-28 07:21:25 -06:00
Vinson Lee
37e98e5cd2
llvmpipe: Remove unnecessary header.
2010-04-28 00:14:39 -07:00
Pierre Willenbrock
2787a2e731
Disable scissor when begining meta operations
...
Signed-off-by: Eric Anholt <eric@anholt.net >
2010-04-27 17:12:39 -07:00
Pierre Willenbrock
6ef6cdec2e
Don't set srcLevel on GL_TEXTURE_RECTANGLE_ARB targets
...
Signed-off-by: Eric Anholt <eric@anholt.net >
2010-04-27 17:12:39 -07:00
Pierre Willenbrock
da498ef41e
Fill the padding between entrys in the sampler key
...
This struct is used to generate a hash, ignoring the entry boundaries.
Signed-off-by: Eric Anholt <eric@anholt.net >
2010-04-27 17:12:39 -07:00
Pierre Willenbrock
d20fce057e
Initialize have_back.
...
There is a user somewhere that tests it before its initial set.
Signed-off-by: Eric Anholt <eric@anholt.net >
2010-04-27 17:12:39 -07:00
Eric Anholt
edad36cff9
i915: Add debugging for just prorgam compile under INTEL_DEBUG=wm
2010-04-27 17:12:38 -07:00
Eric Anholt
891ad6ec1a
i915: Provide counts in the error messages for program limits.
2010-04-27 17:12:38 -07:00
Brian Paul
eecd2a59c1
osmesa: update SRC_DIRS to fix build
2010-04-27 17:06:17 -06:00
Brian Paul
29fc97606b
osdemos: replace assertion with error handler
2010-04-27 17:05:56 -06:00
Marek Olšák
20c9675994
r300g: move ZTOP to separate file
...
Ideally, HiZ should go in r300_hyperz.c next to ZTOP.
2010-04-28 01:05:42 +02:00
Brian Paul
c5bf13c537
osmesa: don't need to link with -lGL
...
The gl entrypoints are in libOSMesa.so
2010-04-27 16:57:43 -06:00
Marek Olšák
7440fd89b4
radeon: fix warnings
2010-04-28 00:38:27 +02:00
Pierre Willenbrock
c0b41116f1
mesa: Disable scissor when begining meta operations
...
Signed-off-by: Brian Paul <brianp@vmware.com >
2010-04-27 15:58:58 -06:00
Ian Romanick
aa6489bce9
Add missing _ in extension category name
2010-04-27 14:54:32 -07:00
Pierre Willenbrock
717e86738f
mesa: Don't set srcLevel on GL_TEXTURE_RECTANGLE_ARB targets
...
Signed-off-by: Brian Paul <brianp@vmware.com >
2010-04-27 15:54:24 -06:00
Pierre Willenbrok
cc806f70b2
glx: Initialize have_back.
...
Signed-off-by: Brian Paul <brianp@vmware.com >
2010-04-27 15:53:28 -06:00
José Fonseca
a5e032853a
gallium: Drop BGNFOR, ENDFOR, REP, and ENDREP opcodes.
...
Arcane DX9 opcodes that never were emitted by Mesa and have no DX10
counterpart. Slated for removal for quite some time now.
2010-04-27 21:51:45 +01:00
José Fonseca
84b5f59c97
gallium/docs: Drop BGNFOR, ENDFOR, REP, and ENDREP opcodes.
2010-04-27 21:51:45 +01:00
José Fonseca
73e1405de0
tgsi: Drop BGNFOR, ENDFOR, REP, and ENDREP opcodes.
2010-04-27 21:51:45 +01:00
José Fonseca
ec4e67999c
r300: Drop BGNFOR, ENDFOR, REP, and ENDREP opcodes.
2010-04-27 21:51:44 +01:00
José Fonseca
42c9137042
cell: Drop BGNFOR, ENDFOR, REP, and ENDREP opcodes.
2010-04-27 21:51:44 +01:00
José Fonseca
e5395f3359
svga: Drop BGNFOR, ENDFOR, REP, and ENDREP opcodes.
2010-04-27 21:51:44 +01:00
José Fonseca
b3ba54a01a
gallivm: Drop BGNFOR, ENDFOR, REP, and ENDREP opcodes.
2010-04-27 21:51:44 +01:00
Jeremy Huddleston
a1cb3babbe
Buildfixes to work around issues in OpenGL.framework
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com >
2010-04-27 12:37:16 -07:00
Jeremy Huddleston
f64773010d
Update OpenGL specs
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com >
2010-04-27 11:26:51 -07:00
Jeremy Huddleston
f5aa5377a5
apple: Use mesa gl.h rather than generating one.
...
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org >
2010-04-27 11:26:51 -07:00
Jeremy Huddleston
de96d063b1
apple: Integrate our libGL into the existing build system better
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com >
2010-04-27 11:26:51 -07:00
Jeremy Huddleston
163901bc7f
darwin: Use clientattrib
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com >
2010-04-27 11:26:51 -07:00
Jeremy Huddleston
80b280db88
apple: Change ifdefs for DRI to be DRI && !APPLE
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com >
2010-04-27 11:26:51 -07:00
Jeremy Huddleston
77dc40b289
apple: Remove duplicate headers that already exist in mesa.
...
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org >
2010-04-27 11:26:50 -07:00
Jeremy Huddleston
ad503c4155
apple: Initial import of libGL for OSX from AppleSGLX svn repository.
...
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com >
2010-04-27 11:26:50 -07:00
Brian Paul
ab3e7861ec
llvmpipe: remove lp_scene_map_buffers(), lp_scene_unmap_buffers()
2010-04-27 11:50:23 -06:00
Brian Paul
bb527c0af6
llvmpipe: implement max scene size
...
When the size of the scene (binned data plus referenced resources/textures)
exceeds LP_MAX_SCENE_SIZE flush/render the scene. This could be improved
in various ways but is a good start.
Fixes piglit streaming-texture-leak test.
2010-04-27 11:44:36 -06:00
Brian Paul
1db3a55b9c
llvmpipe: added llvmpipe_resource_size()
2010-04-27 11:32:25 -06:00
Brian Paul
85ab6d2447
llvmpipe: comment-out unused field for now
2010-04-27 11:31:45 -06:00
Brian Paul
d2f0acc2fb
llvmipe: update comments
2010-04-27 10:55:51 -06:00