projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
[mesa.git]
/
src
/
gallium
/
drivers
/
nv40
/
nv40_state_viewport.c
diff --git
a/src/gallium/drivers/nv40/nv40_state_viewport.c
b/src/gallium/drivers/nv40/nv40_state_viewport.c
index 1b6248e5b8e0c07740194acc0bb5b2606d885749..869a55b40536d9d59718f9f970ba6a08e1e75657 100644
(file)
--- a/
src/gallium/drivers/nv40/nv40_state_viewport.c
+++ b/
src/gallium/drivers/nv40/nv40_state_viewport.c
@@
-3,8
+3,8
@@
static boolean
nv40_state_viewport_validate(struct nv40_context *nv40)
{
static boolean
nv40_state_viewport_validate(struct nv40_context *nv40)
{
- struct nouveau_stateobj *so = so_new(11, 0);
struct pipe_viewport_state *vpt = &nv40->viewport;
struct pipe_viewport_state *vpt = &nv40->viewport;
+ struct nouveau_stateobj *so;
unsigned bypass;
if (nv40->render_mode == HW && !nv40->rasterizer->pipe.bypass_clipping)
unsigned bypass;
if (nv40->render_mode == HW && !nv40->rasterizer->pipe.bypass_clipping)
@@
-18,6
+18,7
@@
nv40_state_viewport_validate(struct nv40_context *nv40)
return FALSE;
nv40->state.viewport_bypass = bypass;
return FALSE;
nv40->state.viewport_bypass = bypass;
+ so = so_new(11, 0);
if (!bypass) {
so_method(so, nv40->screen->curie,
NV40TCL_VIEWPORT_TRANSLATE_X, 8);
if (!bypass) {
so_method(so, nv40->screen->curie,
NV40TCL_VIEWPORT_TRANSLATE_X, 8);