Brian Paul
537d3ed6f3
mesa: another fix for program/texture state validation
...
This fixes a regression introduced in 46ae1abbac
Break program validation into two steps, do part before texture state
validation and do the rest after:
1. Determine Vertex/Fragment _Enabled state.
2. Update texture state.
3. Determine pointers to current Vertex/Fragment programs (which may involve
generating new "fixed-function" programs).
See comments in the code for more details of the dependencies.
2009-02-10 16:28:25 -07:00
Brian Paul
c936a6083e
intel: minor reformatting, comments
2009-02-10 15:54:23 -07:00
Brian Paul
1ed5fe5cbf
mesa: s/_IMAGE_NEW_TRANSFER_STATE/_MESA_NEW_TRANSFER_STATE/ to be more consistant with other flags
2009-02-10 15:53:35 -07:00
Brian Paul
46ae1abbac
mesa: fix/change state validation order for program/texture state
...
Program state needs to be updated before texture state since the later depends
on the former.
Fixes piglit texgen failure. The second time through the modes (press 't'
three times) we disable the fragment program and return to conventional texture
mode. State validation failed here because update_texture() saw stale fragment
program state.
2009-02-10 15:53:35 -07:00
Younes Manton
14d808f8fd
nouveau: nv40 swizzled mipmap fixes.
2009-02-10 16:36:33 -05:00
Patrice Mandin
c2be521d24
nouveau: nv30: fix miptree organization to have swizzled texture+mipmap at the right places
2009-02-10 22:22:55 +01:00
Patrice Mandin
24c379badb
nouveau: revert all my changes here, not the right way
2009-02-10 22:22:06 +01:00
Patrice Mandin
7b66b24c2e
nouveau: stop with 0 dimension
2009-02-10 22:04:56 +01:00
Patrice Mandin
53069cbf29
nouveau: we already have the right src offset
2009-02-10 21:58:49 +01:00
José Fonseca
52233f27bb
progs: Build samples dir with scons and glew.
2009-02-10 20:28:08 +00:00
Patrice Mandin
fa9fcf5e8f
nouveau: do not forget to half dimension.
2009-02-10 21:22:29 +01:00
Patrice Mandin
0cd28c4a1b
nouveau: revert most parts of recent mipmap+swizzle stuff. We only need to find right src and dst offset for given mipmap level.
2009-02-10 21:20:24 +01:00
José Fonseca
8b9aa730c6
progs: Build rebook with scons too.
2009-02-10 20:18:52 +00:00
Keith Whitwell
f54149a3a3
wgl: return before locking if stw_icd is NULL
2009-02-10 19:23:06 +00:00
Keith Whitwell
9c9ba66fba
Merge commit 'origin/gallium-0.2' into gallium-0.2
...
Conflicts:
src/gallium/state_trackers/wgl/icd/stw_icd.c
2009-02-10 19:22:57 +00:00
José Fonseca
1e8177ee17
scons: Use parallel builds by default.
2009-02-10 18:13:05 +00:00
Keith Whitwell
ebb864da9e
wgl: mutex-protect the shared stw_icd struct
2009-02-10 18:11:44 +00:00
Patrice Mandin
02401cbaf0
nouveau: dst offset is correct
2009-02-10 18:44:27 +01:00
José Fonseca
00ee308ab3
pipebuffer: Drop reliance on pipe_winsys.
2009-02-10 17:37:53 +00:00
Patrice Mandin
b20a1b28b7
Missing: tgsi: Fix build -- rename Size to NrTokens.
2009-02-10 18:31:41 +01:00
Patrice Mandin
2f0811054f
nouveau: recalc sub width and height for each mipmap level
2009-02-10 18:09:32 +01:00
Jakob Bornecrantz
767b1acbb7
mesa: Build both software rasterizers for debug
...
But put the gallium one in lib/gallium
2009-02-10 17:43:25 +01:00
Jakob Bornecrantz
1789dc8015
gallium: Don't rebuild common drm code
2009-02-10 16:24:06 +01:00
Jakob Bornecrantz
94665aa648
gallium: Install DRI drivers into lib/gallium
2009-02-10 16:23:59 +01:00
Jakob Bornecrantz
43e6272ae5
gallium: Introduce new subdirs build variables
...
(based on gallium-xorg-driver/commit 270ce504052d415870a25ab59818b2309eb8ac13)
2009-02-10 16:23:02 +01:00
Jakob Bornecrantz
7fad277bbb
Revert "cell: update linux-cell config"
...
This reverts commit 22c6c1eaad
.
Need to revert this since we reverted commited this depended on.
2009-02-10 16:22:32 +01:00
Jakob Bornecrantz
b96d50da8b
Revert "mesa: added new linux-gallium and linux-gallium-debug configs"
...
This reverts commit abbe96cb6e
.
It only reverts parts of the commit the other parts where related to
libmesagallium changes.
2009-02-10 16:22:19 +01:00
Michal Krol
2644985367
nv40: Fix build -- rename Size to NrTokens.
2009-02-10 15:18:32 +01:00
Michal Krol
844034dee5
nv30: Fix build -- rename Size to NrTokens.
2009-02-10 15:18:19 +01:00
Michal Krol
adc6847260
nv20: Fix build -- rename Size to NrTokens.
2009-02-10 15:18:03 +01:00
Michal Krol
276de3ffcf
brw: Fix build -- rename Size to NrTokens.
2009-02-10 15:17:41 +01:00
Michal Krol
0020e1d108
i915: Fix build -- rename Size to NrTokens.
2009-02-10 15:17:17 +01:00
Michal Krol
a872b518c9
gallivm: Fix build -- rename Size to NrTokens.
2009-02-10 15:16:35 +01:00
Michal Krol
e3028baff2
draw: Fix build -- rename Size to NrTokens.
2009-02-10 15:16:00 +01:00
Michal Krol
5ecd0b0890
tgsi: Fix build -- rename Size to NrTokens.
2009-02-10 15:14:31 +01:00
Michal Krol
bf3930453c
gallium: Rename Size member of TGSI token to NrTokens.
...
Driver writers often got confused and assumed Size to be
the number of immediate values in Immediate declaration.
2009-02-10 15:12:34 +01:00
Keith Whitwell
a88e2544ee
vmw/icd: remove bogus current_context value
2009-02-10 14:03:43 +00:00
José Fonseca
dc6cc4f9da
mesa: Compare formats using nominal bytes per pixel.
...
This is a temporary fix which works for the formats we care so far. The
real fix would be abandon the concept "nominal bytes per pixel" entirely
in Mesa, and use macropixels instead, as done in gallium interfaces
already.
2009-02-10 13:40:00 +00:00
Michel Dänzer
eaf15db895
gallium: Fixups for driCreateConfigs MSAA support.
...
Add the MSAA samples array or make sure its contents are initialized.
2009-02-10 13:47:49 +01:00
José Fonseca
67e988a06c
wgl: Fix null pointer reference.
2009-02-10 11:51:47 +00:00
José Fonseca
9fb9ee9d24
stw: Hack for applications which use wglSetPixelFormat instead of SetPixelFormat.
2009-02-10 11:51:47 +00:00
José Fonseca
5b0807b72f
glut: Use the official WGL functions.
...
Especially using wglGetPixelFormat instead of GetPixelFormat causes
problems with opengl32.dll and drivers that not hack around this issue.
2009-02-10 11:51:46 +00:00
José Fonseca
aeed92952e
glut: DESCRIPTION .def clause deprecated.
2009-02-10 11:51:46 +00:00
José Fonseca
42523a83b3
wgl: s/0x%p/%p/g
...
Rather not have 0x prefix, than 0x0x in certain platforms.
2009-02-10 11:51:46 +00:00
Brian
028780a809
demos: remove OSMESA stuff from Makefile
2009-02-09 19:40:10 -07:00
Benjamin Close
17fe478085
autogen: Make sure MAKEFLAGS is not set before running autoreconf
...
Without this the "w" flag may be set which causes the version
to be incorrectly to be obtains in configure.ac causing configure
to fail miserably
2009-02-10 11:58:11 +10:30
Brian Paul
7e0bc2eb8d
mesa: add x86/rtasm/x86sse.c to fix linux-x86 build
2009-02-09 15:41:06 -07:00
Roland Scheidegger
93da69def4
mesa: fixes for srgb formats
...
swizzling in fetch/store srgba/sargb functions fixed (consistent with
equivalent non-srgb formats now).
2009-02-09 23:18:07 +01:00
Roland Scheidegger
cb3c54ea86
fix _mesa_get_teximage for srgb textures
2009-02-09 23:17:43 +01:00
Brian Paul
aad3f546a0
mesa: avoid setting texObj->_Complete = GL_FALSE when there's no state change
...
Avoid a little bit of unneeded state validation and fixes a bug where the
texture complete flags was set to false, but we didn't signal _NEW_TEXTURE.
Fixes piglit tex1d-2dborder failure.
2009-02-09 14:00:47 -07:00