projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ef9b4d2
)
gallium: remnants of old ccw state
author
Keith Whitwell
<keithw@vmware.com>
Fri, 21 May 2010 15:05:16 +0000
(16:05 +0100)
committer
Keith Whitwell
<keithw@vmware.com>
Fri, 21 May 2010 15:05:16 +0000
(16:05 +0100)
src/gallium/drivers/cell/ppu/cell_render.c
patch
|
blob
|
history
src/gallium/drivers/cell/spu/spu_tri.c
patch
|
blob
|
history
src/gallium/state_trackers/python/st_device.c
patch
|
blob
|
history
src/gallium/tests/graw/quad-tex.c
patch
|
blob
|
history
src/gallium/tests/trivial/quad-tex.c
patch
|
blob
|
history
src/gallium/tests/trivial/tri.c
patch
|
blob
|
history
diff --git
a/src/gallium/drivers/cell/ppu/cell_render.c
b/src/gallium/drivers/cell/ppu/cell_render.c
index 79cb8df82fac524d2e9364ce9c4b41ec0393d1c2..f648482c551a3780f632e9acab6e2a08d505299e 100644
(file)
--- a/
src/gallium/drivers/cell/ppu/cell_render.c
+++ b/
src/gallium/drivers/cell/ppu/cell_render.c
@@
-152,7
+152,7
@@
cell_flush_prim_buffer(struct cell_context *cell)
struct cell_command_render *render = &cell_global.command[i].render;
render->prim_type = PIPE_PRIM_TRIANGLES;
render->num_verts = cell->prim_buffer.num_verts;
struct cell_command_render *render = &cell_global.command[i].render;
render->prim_type = PIPE_PRIM_TRIANGLES;
render->num_verts = cell->prim_buffer.num_verts;
- render->front_
winding = cell->rasterizer->front_winding
;
+ render->front_
ccw = cell->rasterizer->front_ccw
;
render->vertex_size = cell->vertex_info->size * 4;
render->xmin = cell->prim_buffer.xmin;
render->ymin = cell->prim_buffer.ymin;
render->vertex_size = cell->vertex_info->size * 4;
render->xmin = cell->prim_buffer.xmin;
render->ymin = cell->prim_buffer.ymin;
diff --git
a/src/gallium/drivers/cell/spu/spu_tri.c
b/src/gallium/drivers/cell/spu/spu_tri.c
index f619380d8079900a75da0023dfe941c05e2d3931..efeebca27bb72b88594e6dd21ff82a69e8acb1f3 100644
(file)
--- a/
src/gallium/drivers/cell/spu/spu_tri.c
+++ b/
src/gallium/drivers/cell/spu/spu_tri.c
@@
-568,7
+568,7
@@
setup_sort_vertices(const qword vs)
ASSERT(CELL_FACING_FRONT == 0);
ASSERT(CELL_FACING_BACK == 1);
setup.facing = (area * sign > 0.0f)
ASSERT(CELL_FACING_FRONT == 0);
ASSERT(CELL_FACING_BACK == 1);
setup.facing = (area * sign > 0.0f)
- ^ (
spu.rasterizer.front_winding == PIPE_WINDING_CW
);
+ ^ (
!spu.rasterizer.front_ccw
);
return TRUE;
}
return TRUE;
}
diff --git
a/src/gallium/state_trackers/python/st_device.c
b/src/gallium/state_trackers/python/st_device.c
index aac28cacfdea1425f78b49821cd41182f9a2a321..dce24bc17d61901375126ac6e6127a3ad891023b 100644
(file)
--- a/
src/gallium/state_trackers/python/st_device.c
+++ b/
src/gallium/state_trackers/python/st_device.c
@@
-184,8
+184,7
@@
st_context_create(struct st_device *st_dev)
{
struct pipe_rasterizer_state rasterizer;
memset(&rasterizer, 0, sizeof(rasterizer));
{
struct pipe_rasterizer_state rasterizer;
memset(&rasterizer, 0, sizeof(rasterizer));
- rasterizer.front_winding = PIPE_WINDING_CW;
- rasterizer.cull_mode = PIPE_WINDING_NONE;
+ rasterizer.cull_face = PIPE_FACE_NONE;
cso_set_rasterizer(st_ctx->cso, &rasterizer);
}
cso_set_rasterizer(st_ctx->cso, &rasterizer);
}
diff --git
a/src/gallium/tests/graw/quad-tex.c
b/src/gallium/tests/graw/quad-tex.c
index 91b1cf49edda54ae4a637452930c539908ffb79d..225cbfc8e884799a7594fbe566296854a04ef14b 100644
(file)
--- a/
src/gallium/tests/graw/quad-tex.c
+++ b/
src/gallium/tests/graw/quad-tex.c
@@
-377,8
+377,7
@@
static void init( void )
struct pipe_rasterizer_state rasterizer;
void *handle;
memset(&rasterizer, 0, sizeof rasterizer);
struct pipe_rasterizer_state rasterizer;
void *handle;
memset(&rasterizer, 0, sizeof rasterizer);
- rasterizer.front_winding = PIPE_WINDING_CW;
- rasterizer.cull_mode = PIPE_WINDING_NONE;
+ rasterizer.cull_face = PIPE_FACE_NONE;
rasterizer.gl_rasterization_rules = 1;
handle = ctx->create_rasterizer_state(ctx, &rasterizer);
ctx->bind_rasterizer_state(ctx, handle);
rasterizer.gl_rasterization_rules = 1;
handle = ctx->create_rasterizer_state(ctx, &rasterizer);
ctx->bind_rasterizer_state(ctx, handle);
diff --git
a/src/gallium/tests/trivial/quad-tex.c
b/src/gallium/tests/trivial/quad-tex.c
index 522ff3cb42de8ec20c97b6cff26f51e3fa71901d..93f24876cbb9099bb06ebee16ded82bd932c9f47 100644
(file)
--- a/
src/gallium/tests/trivial/quad-tex.c
+++ b/
src/gallium/tests/trivial/quad-tex.c
@@
-201,8
+201,7
@@
static void init_prog(struct program *p)
/* rasterizer */
memset(&p->rasterizer, 0, sizeof(p->rasterizer));
/* rasterizer */
memset(&p->rasterizer, 0, sizeof(p->rasterizer));
- p->rasterizer.front_winding = PIPE_WINDING_CW;
- p->rasterizer.cull_mode = PIPE_WINDING_NONE;
+ p->rasterizer.cull_face = PIPE_FACE_NONE;
p->rasterizer.gl_rasterization_rules = 1;
/* sampler */
p->rasterizer.gl_rasterization_rules = 1;
/* sampler */
diff --git
a/src/gallium/tests/trivial/tri.c
b/src/gallium/tests/trivial/tri.c
index 48305240a4b8d920ecebff69d379121216588407..7823c27727dab987b44c42ee5fc8dc11708f3dc8 100644
(file)
--- a/
src/gallium/tests/trivial/tri.c
+++ b/
src/gallium/tests/trivial/tri.c
@@
-151,8
+151,7
@@
static void init_prog(struct program *p)
/* rasterizer */
memset(&p->rasterizer, 0, sizeof(p->rasterizer));
/* rasterizer */
memset(&p->rasterizer, 0, sizeof(p->rasterizer));
- p->rasterizer.front_winding = PIPE_WINDING_CW;
- p->rasterizer.cull_mode = PIPE_WINDING_NONE;
+ p->rasterizer.cull_face = PIPE_FACE_NONE;
p->rasterizer.gl_rasterization_rules = 1;
/* drawing destination */
p->rasterizer.gl_rasterization_rules = 1;
/* drawing destination */