projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cell: remove unneeded blend/depth_stencil subclasses
[mesa.git]
/
src
/
gallium
/
drivers
/
cell
/
ppu
/
cell_pipe_state.c
diff --git
a/src/gallium/drivers/cell/ppu/cell_pipe_state.c
b/src/gallium/drivers/cell/ppu/cell_pipe_state.c
index ea820aca7443e856d8e6902e2f6652053702130a..b545d2d697562c4839595dca2bba12e83262711f 100644
(file)
--- a/
src/gallium/drivers/cell/ppu/cell_pipe_state.c
+++ b/
src/gallium/drivers/cell/ppu/cell_pipe_state.c
@@
-37,7
+37,6
@@
#include "cell_flush.h"
#include "cell_state.h"
#include "cell_texture.h"
#include "cell_flush.h"
#include "cell_state.h"
#include "cell_texture.h"
-#include "cell_state_per_fragment.h"
@@
-45,13
+44,7
@@
static void *
cell_create_blend_state(struct pipe_context *pipe,
const struct pipe_blend_state *blend)
{
cell_create_blend_state(struct pipe_context *pipe,
const struct pipe_blend_state *blend)
{
- struct cell_blend_state *cb = MALLOC(sizeof(struct cell_blend_state));
-
- (void) memcpy(cb, blend, sizeof(*blend));
-#if 0
- cell_generate_alpha_blend(cb);
-#endif
- return cb;
+ return mem_dup(blend, sizeof(*blend));
}
}
@@
-62,7
+55,7
@@
cell_bind_blend_state(struct pipe_context *pipe, void *state)
draw_flush(cell->draw);
draw_flush(cell->draw);
- cell->blend = (struct
cell
_blend_state *) state;
+ cell->blend = (struct
pipe
_blend_state *) state;
cell->dirty |= CELL_NEW_BLEND;
}
cell->dirty |= CELL_NEW_BLEND;
}
@@
-70,12
+63,7
@@
cell_bind_blend_state(struct pipe_context *pipe, void *state)
static void
cell_delete_blend_state(struct pipe_context *pipe, void *blend)
{
static void
cell_delete_blend_state(struct pipe_context *pipe, void *blend)
{
- struct cell_blend_state *cb = (struct cell_blend_state *) blend;
-
-#if 0
- spe_release_func(& cb->code);
-#endif
- FREE(cb);
+ FREE(blend);
}
}
@@
-97,43
+85,29
@@
cell_set_blend_color(struct pipe_context *pipe,
static void *
cell_create_depth_stencil_alpha_state(struct pipe_context *pipe,
static void *
cell_create_depth_stencil_alpha_state(struct pipe_context *pipe,
- const struct pipe_depth_stencil_alpha_state *d
epth_stencil
)
+ const struct pipe_depth_stencil_alpha_state *d
sa
)
{
{
- struct cell_depth_stencil_alpha_state *cdsa =
- MALLOC(sizeof(struct cell_depth_stencil_alpha_state));
-
- (void) memcpy(cdsa, depth_stencil, sizeof(*depth_stencil));
-#if 0
- cell_generate_depth_stencil_test(cdsa);
-#endif
- return cdsa;
+ return mem_dup(dsa, sizeof(*dsa));
}
static void
cell_bind_depth_stencil_alpha_state(struct pipe_context *pipe,
}
static void
cell_bind_depth_stencil_alpha_state(struct pipe_context *pipe,
- void *d
epth_stencil
)
+ void *d
sa
)
{
struct cell_context *cell = cell_context(pipe);
draw_flush(cell->draw);
{
struct cell_context *cell = cell_context(pipe);
draw_flush(cell->draw);
- cell->depth_stencil =
- (struct cell_depth_stencil_alpha_state *) depth_stencil;
+ cell->depth_stencil = (struct pipe_depth_stencil_alpha_state *) dsa;
cell->dirty |= CELL_NEW_DEPTH_STENCIL;
}
static void
cell->dirty |= CELL_NEW_DEPTH_STENCIL;
}
static void
-cell_delete_depth_stencil_alpha_state(struct pipe_context *pipe, void *d
epth
)
+cell_delete_depth_stencil_alpha_state(struct pipe_context *pipe, void *d
sa
)
{
{
- struct cell_depth_stencil_alpha_state *cdsa =
- (struct cell_depth_stencil_alpha_state *) depth;
-
-#if 0
- spe_release_func(& cdsa->code);
-#endif
- FREE(cdsa);
+ FREE(dsa);
}
}