cell: put most simple state-setter functions in new cell_pipe_state.c file
Also, re-org of texture/surface functions.
This commit is contained in:
parent
4eae65c8e0
commit
9171e63f41
|
@ -25,14 +25,10 @@ SOURCES = \
|
|||
cell_context.c \
|
||||
cell_draw_arrays.c \
|
||||
cell_flush.c \
|
||||
cell_state_blend.c \
|
||||
cell_state_clip.c \
|
||||
cell_state_derived.c \
|
||||
cell_state_emit.c \
|
||||
cell_state_fs.c \
|
||||
cell_state_rasterizer.c \
|
||||
cell_state_sampler.c \
|
||||
cell_state_surface.c \
|
||||
cell_pipe_state.c \
|
||||
cell_state_vertex.c \
|
||||
cell_spu.c \
|
||||
cell_surface.c \
|
||||
|
|
|
@ -48,6 +48,7 @@
|
|||
#include "cell_state.h"
|
||||
#include "cell_surface.h"
|
||||
#include "cell_spu.h"
|
||||
#include "cell_pipe_state.h"
|
||||
#include "cell_texture.h"
|
||||
#include "cell_vbuf.h"
|
||||
|
||||
|
@ -198,22 +199,6 @@ cell_create_context(struct pipe_winsys *winsys, struct cell_winsys *cws)
|
|||
|
||||
|
||||
/* state setters */
|
||||
cell->pipe.create_blend_state = cell_create_blend_state;
|
||||
cell->pipe.bind_blend_state = cell_bind_blend_state;
|
||||
cell->pipe.delete_blend_state = cell_delete_blend_state;
|
||||
|
||||
cell->pipe.create_sampler_state = cell_create_sampler_state;
|
||||
cell->pipe.bind_sampler_state = cell_bind_sampler_state;
|
||||
cell->pipe.delete_sampler_state = cell_delete_sampler_state;
|
||||
|
||||
cell->pipe.create_depth_stencil_alpha_state = cell_create_depth_stencil_alpha_state;
|
||||
cell->pipe.bind_depth_stencil_alpha_state = cell_bind_depth_stencil_alpha_state;
|
||||
cell->pipe.delete_depth_stencil_alpha_state = cell_delete_depth_stencil_alpha_state;
|
||||
|
||||
cell->pipe.create_rasterizer_state = cell_create_rasterizer_state;
|
||||
cell->pipe.bind_rasterizer_state = cell_bind_rasterizer_state;
|
||||
cell->pipe.delete_rasterizer_state = cell_delete_rasterizer_state;
|
||||
|
||||
cell->pipe.create_fs_state = cell_create_fs_state;
|
||||
cell->pipe.bind_fs_state = cell_bind_fs_state;
|
||||
cell->pipe.delete_fs_state = cell_delete_fs_state;
|
||||
|
@ -222,16 +207,8 @@ cell_create_context(struct pipe_winsys *winsys, struct cell_winsys *cws)
|
|||
cell->pipe.bind_vs_state = cell_bind_vs_state;
|
||||
cell->pipe.delete_vs_state = cell_delete_vs_state;
|
||||
|
||||
cell->pipe.set_blend_color = cell_set_blend_color;
|
||||
cell->pipe.set_clip_state = cell_set_clip_state;
|
||||
cell->pipe.set_constant_buffer = cell_set_constant_buffer;
|
||||
|
||||
cell->pipe.set_framebuffer_state = cell_set_framebuffer_state;
|
||||
|
||||
cell->pipe.set_polygon_stipple = cell_set_polygon_stipple;
|
||||
cell->pipe.set_scissor_state = cell_set_scissor_state;
|
||||
cell->pipe.set_viewport_state = cell_set_viewport_state;
|
||||
|
||||
cell->pipe.set_vertex_buffer = cell_set_vertex_buffer;
|
||||
cell->pipe.set_vertex_element = cell_set_vertex_element;
|
||||
|
||||
|
@ -241,21 +218,15 @@ cell_create_context(struct pipe_winsys *winsys, struct cell_winsys *cws)
|
|||
cell->pipe.clear = cell_clear_surface;
|
||||
cell->pipe.flush = cell_flush;
|
||||
|
||||
/* textures */
|
||||
cell->pipe.texture_create = cell_texture_create;
|
||||
cell->pipe.texture_release = cell_texture_release;
|
||||
cell->pipe.texture_update = cell_texture_update;
|
||||
cell->pipe.get_tex_surface = cell_get_tex_surface;
|
||||
|
||||
cell->pipe.set_sampler_texture = cell_set_sampler_texture;
|
||||
|
||||
#if 0
|
||||
cell->pipe.begin_query = cell_begin_query;
|
||||
cell->pipe.end_query = cell_end_query;
|
||||
cell->pipe.wait_query = cell_wait_query;
|
||||
#endif
|
||||
|
||||
cell_init_state_functions(cell);
|
||||
cell_init_surface_functions(cell);
|
||||
cell_init_texture_functions(cell);
|
||||
|
||||
cell->draw = cell_draw_create(cell);
|
||||
|
||||
|
|
|
@ -0,0 +1,323 @@
|
|||
/**************************************************************************
|
||||
*
|
||||
* Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
|
||||
* All Rights Reserved.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the
|
||||
* "Software"), to deal in the Software without restriction, including
|
||||
* without limitation the rights to use, copy, modify, merge, publish,
|
||||
* distribute, sub license, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice (including the
|
||||
* next paragraph) shall be included in all copies or substantial portions
|
||||
* of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
|
||||
* IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
|
||||
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
||||
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
||||
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*
|
||||
**************************************************************************/
|
||||
|
||||
/* Authors:
|
||||
* Keith Whitwell <keith@tungstengraphics.com>
|
||||
* Brian Paul
|
||||
*/
|
||||
|
||||
#include "pipe/p_util.h"
|
||||
#include "pipe/p_inlines.h"
|
||||
#include "draw/draw_context.h"
|
||||
#include "cell_context.h"
|
||||
#include "cell_state.h"
|
||||
#include "cell_texture.h"
|
||||
|
||||
|
||||
|
||||
static void *
|
||||
cell_create_blend_state(struct pipe_context *pipe,
|
||||
const struct pipe_blend_state *blend)
|
||||
{
|
||||
return mem_dup(blend, sizeof(*blend));
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
cell_bind_blend_state(struct pipe_context *pipe, void *blend)
|
||||
{
|
||||
struct cell_context *cell = cell_context(pipe);
|
||||
|
||||
draw_flush(cell->draw);
|
||||
|
||||
cell->blend = (const struct pipe_blend_state *)blend;
|
||||
|
||||
cell->dirty |= CELL_NEW_BLEND;
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
cell_delete_blend_state(struct pipe_context *pipe, void *blend)
|
||||
{
|
||||
FREE(blend);
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
cell_set_blend_color(struct pipe_context *pipe,
|
||||
const struct pipe_blend_color *blend_color)
|
||||
{
|
||||
struct cell_context *cell = cell_context(pipe);
|
||||
|
||||
draw_flush(cell->draw);
|
||||
|
||||
cell->blend_color = *blend_color;
|
||||
|
||||
cell->dirty |= CELL_NEW_BLEND;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
static void *
|
||||
cell_create_depth_stencil_alpha_state(struct pipe_context *pipe,
|
||||
const struct pipe_depth_stencil_alpha_state *depth_stencil)
|
||||
{
|
||||
return mem_dup(depth_stencil, sizeof(*depth_stencil));
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
cell_bind_depth_stencil_alpha_state(struct pipe_context *pipe,
|
||||
void *depth_stencil)
|
||||
{
|
||||
struct cell_context *cell = cell_context(pipe);
|
||||
|
||||
draw_flush(cell->draw);
|
||||
|
||||
cell->depth_stencil
|
||||
= (const struct pipe_depth_stencil_alpha_state *) depth_stencil;
|
||||
|
||||
cell->dirty |= CELL_NEW_DEPTH_STENCIL;
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
cell_delete_depth_stencil_alpha_state(struct pipe_context *pipe, void *depth)
|
||||
{
|
||||
FREE(depth);
|
||||
}
|
||||
|
||||
|
||||
static void cell_set_clip_state( struct pipe_context *pipe,
|
||||
const struct pipe_clip_state *clip )
|
||||
{
|
||||
struct cell_context *cell = cell_context(pipe);
|
||||
|
||||
/* pass the clip state to the draw module */
|
||||
draw_set_clip_state(cell->draw, clip);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* Called when driver state tracker notices changes to the viewport
|
||||
* matrix:
|
||||
*/
|
||||
static void
|
||||
cell_set_viewport_state( struct pipe_context *pipe,
|
||||
const struct pipe_viewport_state *viewport )
|
||||
{
|
||||
struct cell_context *cell = cell_context(pipe);
|
||||
|
||||
cell->viewport = *viewport; /* struct copy */
|
||||
cell->dirty |= CELL_NEW_VIEWPORT;
|
||||
|
||||
/* pass the viewport info to the draw module */
|
||||
draw_set_viewport_state(cell->draw, viewport);
|
||||
|
||||
/* Using tnl/ and vf/ modules is temporary while getting started.
|
||||
* Full pipe will have vertex shader, vertex fetch of its own.
|
||||
*/
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
cell_set_scissor_state( struct pipe_context *pipe,
|
||||
const struct pipe_scissor_state *scissor )
|
||||
{
|
||||
struct cell_context *cell = cell_context(pipe);
|
||||
|
||||
memcpy( &cell->scissor, scissor, sizeof(*scissor) );
|
||||
cell->dirty |= CELL_NEW_SCISSOR;
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
cell_set_polygon_stipple( struct pipe_context *pipe,
|
||||
const struct pipe_poly_stipple *stipple )
|
||||
{
|
||||
struct cell_context *cell = cell_context(pipe);
|
||||
|
||||
memcpy( &cell->poly_stipple, stipple, sizeof(*stipple) );
|
||||
cell->dirty |= CELL_NEW_STIPPLE;
|
||||
}
|
||||
|
||||
|
||||
|
||||
static void *
|
||||
cell_create_rasterizer_state(struct pipe_context *pipe,
|
||||
const struct pipe_rasterizer_state *setup)
|
||||
{
|
||||
struct pipe_rasterizer_state *state
|
||||
= MALLOC(sizeof(struct pipe_rasterizer_state));
|
||||
memcpy(state, setup, sizeof(struct pipe_rasterizer_state));
|
||||
return state;
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
cell_bind_rasterizer_state(struct pipe_context *pipe, void *setup)
|
||||
{
|
||||
struct cell_context *cell = cell_context(pipe);
|
||||
|
||||
/* pass-through to draw module */
|
||||
draw_set_rasterizer_state(cell->draw, setup);
|
||||
|
||||
cell->rasterizer = (struct pipe_rasterizer_state *)setup;
|
||||
|
||||
cell->dirty |= CELL_NEW_RASTERIZER;
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
cell_delete_rasterizer_state(struct pipe_context *pipe, void *rasterizer)
|
||||
{
|
||||
FREE(rasterizer);
|
||||
}
|
||||
|
||||
|
||||
|
||||
static void *
|
||||
cell_create_sampler_state(struct pipe_context *pipe,
|
||||
const struct pipe_sampler_state *sampler)
|
||||
{
|
||||
return mem_dup(sampler, sizeof(*sampler));
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
cell_bind_sampler_state(struct pipe_context *pipe,
|
||||
unsigned unit, void *sampler)
|
||||
{
|
||||
struct cell_context *cell = cell_context(pipe);
|
||||
|
||||
draw_flush(cell->draw);
|
||||
|
||||
assert(unit < PIPE_MAX_SAMPLERS);
|
||||
cell->sampler[unit] = (struct pipe_sampler_state *)sampler;
|
||||
|
||||
cell->dirty |= CELL_NEW_SAMPLER;
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
cell_delete_sampler_state(struct pipe_context *pipe,
|
||||
void *sampler)
|
||||
{
|
||||
FREE( sampler );
|
||||
}
|
||||
|
||||
|
||||
|
||||
static void
|
||||
cell_set_sampler_texture(struct pipe_context *pipe,
|
||||
unsigned sampler,
|
||||
struct pipe_texture *texture)
|
||||
{
|
||||
struct cell_context *cell = cell_context(pipe);
|
||||
|
||||
draw_flush(cell->draw);
|
||||
|
||||
cell->texture[sampler] = cell_texture(texture);
|
||||
|
||||
cell_update_texture_mapping(cell);
|
||||
|
||||
cell->dirty |= CELL_NEW_TEXTURE;
|
||||
}
|
||||
|
||||
|
||||
|
||||
static void
|
||||
cell_set_framebuffer_state(struct pipe_context *pipe,
|
||||
const struct pipe_framebuffer_state *fb)
|
||||
{
|
||||
struct cell_context *cell = cell_context(pipe);
|
||||
|
||||
if (1 /*memcmp(&cell->framebuffer, fb, sizeof(*fb))*/) {
|
||||
struct pipe_surface *csurf = fb->cbufs[0];
|
||||
struct pipe_surface *zsurf = fb->zsbuf;
|
||||
uint i;
|
||||
|
||||
/* unmap old surfaces */
|
||||
for (i = 0; i < PIPE_MAX_COLOR_BUFS; i++) {
|
||||
if (cell->framebuffer.cbufs[i] && cell->cbuf_map[i]) {
|
||||
pipe_surface_unmap(cell->framebuffer.cbufs[i]);
|
||||
cell->cbuf_map[i] = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
if (cell->framebuffer.zsbuf && cell->zsbuf_map) {
|
||||
pipe_surface_unmap(cell->framebuffer.zsbuf);
|
||||
cell->zsbuf_map = NULL;
|
||||
}
|
||||
|
||||
/* update my state */
|
||||
cell->framebuffer = *fb;
|
||||
|
||||
/* map new surfaces */
|
||||
if (csurf)
|
||||
cell->cbuf_map[0] = pipe_surface_map(csurf);
|
||||
|
||||
if (zsurf)
|
||||
cell->zsbuf_map = pipe_surface_map(zsurf);
|
||||
|
||||
cell->dirty |= CELL_NEW_FRAMEBUFFER;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
void
|
||||
cell_init_state_functions(struct cell_context *cell)
|
||||
{
|
||||
cell->pipe.create_blend_state = cell_create_blend_state;
|
||||
cell->pipe.bind_blend_state = cell_bind_blend_state;
|
||||
cell->pipe.delete_blend_state = cell_delete_blend_state;
|
||||
|
||||
cell->pipe.create_sampler_state = cell_create_sampler_state;
|
||||
cell->pipe.bind_sampler_state = cell_bind_sampler_state;
|
||||
cell->pipe.delete_sampler_state = cell_delete_sampler_state;
|
||||
|
||||
cell->pipe.create_depth_stencil_alpha_state = cell_create_depth_stencil_alpha_state;
|
||||
cell->pipe.bind_depth_stencil_alpha_state = cell_bind_depth_stencil_alpha_state;
|
||||
cell->pipe.delete_depth_stencil_alpha_state = cell_delete_depth_stencil_alpha_state;
|
||||
|
||||
cell->pipe.create_rasterizer_state = cell_create_rasterizer_state;
|
||||
cell->pipe.bind_rasterizer_state = cell_bind_rasterizer_state;
|
||||
cell->pipe.delete_rasterizer_state = cell_delete_rasterizer_state;
|
||||
|
||||
cell->pipe.set_blend_color = cell_set_blend_color;
|
||||
cell->pipe.set_clip_state = cell_set_clip_state;
|
||||
cell->pipe.set_constant_buffer = cell_set_constant_buffer;
|
||||
|
||||
cell->pipe.set_framebuffer_state = cell_set_framebuffer_state;
|
||||
|
||||
cell->pipe.set_polygon_stipple = cell_set_polygon_stipple;
|
||||
cell->pipe.set_scissor_state = cell_set_scissor_state;
|
||||
cell->pipe.set_viewport_state = cell_set_viewport_state;
|
||||
}
|
||||
|
|
@ -0,0 +1,39 @@
|
|||
/**************************************************************************
|
||||
*
|
||||
* Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
|
||||
* All Rights Reserved.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the
|
||||
* "Software"), to deal in the Software without restriction, including
|
||||
* without limitation the rights to use, copy, modify, merge, publish,
|
||||
* distribute, sub license, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice (including the
|
||||
* next paragraph) shall be included in all copies or substantial portions
|
||||
* of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
|
||||
* IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
|
||||
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
||||
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
||||
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*
|
||||
**************************************************************************/
|
||||
|
||||
|
||||
#ifndef CELL_PIPE_STATE_H
|
||||
#define CELL_PIPE_STATE_H
|
||||
|
||||
|
||||
struct cell_context;
|
||||
|
||||
extern void
|
||||
cell_init_state_functions(struct cell_context *cell);
|
||||
|
||||
|
||||
#endif /* CELL_PIPE_STATE_H */
|
|
@ -23,42 +23,6 @@
|
|||
|
||||
|
||||
|
||||
extern void
|
||||
cell_set_framebuffer_state( struct pipe_context *,
|
||||
const struct pipe_framebuffer_state * );
|
||||
|
||||
|
||||
|
||||
extern void *
|
||||
cell_create_blend_state(struct pipe_context *, const struct pipe_blend_state *);
|
||||
extern void cell_bind_blend_state(struct pipe_context *, void *);
|
||||
extern void cell_delete_blend_state(struct pipe_context *, void *);
|
||||
|
||||
extern void cell_set_blend_color( struct pipe_context *pipe,
|
||||
const struct pipe_blend_color *blend_color );
|
||||
|
||||
|
||||
void *
|
||||
cell_create_sampler_state(struct pipe_context *,
|
||||
const struct pipe_sampler_state *);
|
||||
|
||||
extern void
|
||||
cell_bind_sampler_state(struct pipe_context *, unsigned, void *);
|
||||
|
||||
extern void
|
||||
cell_delete_sampler_state(struct pipe_context *, void *);
|
||||
|
||||
|
||||
extern void *
|
||||
cell_create_depth_stencil_alpha_state(struct pipe_context *,
|
||||
const struct pipe_depth_stencil_alpha_state *);
|
||||
|
||||
extern void
|
||||
cell_bind_depth_stencil_alpha_state(struct pipe_context *, void *);
|
||||
|
||||
extern void
|
||||
cell_delete_depth_stencil_alpha_state(struct pipe_context *, void *);
|
||||
|
||||
|
||||
void *cell_create_fs_state(struct pipe_context *,
|
||||
const struct pipe_shader_state *);
|
||||
|
@ -69,34 +33,11 @@ void *cell_create_vs_state(struct pipe_context *,
|
|||
void cell_bind_vs_state(struct pipe_context *, void *);
|
||||
void cell_delete_vs_state(struct pipe_context *, void *);
|
||||
|
||||
|
||||
void *
|
||||
cell_create_rasterizer_state(struct pipe_context *,
|
||||
const struct pipe_rasterizer_state *);
|
||||
void cell_bind_rasterizer_state(struct pipe_context *, void *);
|
||||
void cell_delete_rasterizer_state(struct pipe_context *, void *);
|
||||
|
||||
|
||||
void cell_set_clip_state( struct pipe_context *,
|
||||
const struct pipe_clip_state * );
|
||||
|
||||
void cell_set_constant_buffer(struct pipe_context *pipe,
|
||||
uint shader, uint index,
|
||||
const struct pipe_constant_buffer *buf);
|
||||
|
||||
void cell_set_polygon_stipple( struct pipe_context *,
|
||||
const struct pipe_poly_stipple * );
|
||||
|
||||
void
|
||||
cell_set_sampler_texture(struct pipe_context *pipe,
|
||||
unsigned sampler,
|
||||
struct pipe_texture *texture);
|
||||
cell_set_constant_buffer(struct pipe_context *pipe,
|
||||
uint shader, uint index,
|
||||
const struct pipe_constant_buffer *buf);
|
||||
|
||||
void cell_set_scissor_state( struct pipe_context *,
|
||||
const struct pipe_scissor_state * );
|
||||
|
||||
void cell_set_texture_state( struct pipe_context *,
|
||||
unsigned unit, struct pipe_texture * );
|
||||
|
||||
void cell_set_vertex_element(struct pipe_context *,
|
||||
unsigned index,
|
||||
|
@ -106,10 +47,6 @@ void cell_set_vertex_buffer(struct pipe_context *,
|
|||
unsigned index,
|
||||
const struct pipe_vertex_buffer *);
|
||||
|
||||
void cell_set_viewport_state( struct pipe_context *,
|
||||
const struct pipe_viewport_state * );
|
||||
|
||||
|
||||
void cell_update_derived( struct cell_context *softpipe );
|
||||
|
||||
#endif
|
||||
|
|
|
@ -79,8 +79,9 @@ cell_texture_layout(struct cell_texture * spt)
|
|||
}
|
||||
|
||||
|
||||
struct pipe_texture *
|
||||
cell_texture_create(struct pipe_context *pipe, const struct pipe_texture *templat)
|
||||
static struct pipe_texture *
|
||||
cell_texture_create(struct pipe_context *pipe,
|
||||
const struct pipe_texture *templat)
|
||||
{
|
||||
struct cell_texture *spt = CALLOC_STRUCT(cell_texture);
|
||||
if (!spt)
|
||||
|
@ -103,7 +104,7 @@ cell_texture_create(struct pipe_context *pipe, const struct pipe_texture *templa
|
|||
}
|
||||
|
||||
|
||||
void
|
||||
static void
|
||||
cell_texture_release(struct pipe_context *pipe, struct pipe_texture **pt)
|
||||
{
|
||||
if (!*pt)
|
||||
|
@ -128,7 +129,7 @@ cell_texture_release(struct pipe_context *pipe, struct pipe_texture **pt)
|
|||
}
|
||||
|
||||
|
||||
void
|
||||
static void
|
||||
cell_texture_update(struct pipe_context *pipe, struct pipe_texture *texture)
|
||||
{
|
||||
/* XXX TO DO: re-tile the texture data ... */
|
||||
|
@ -139,7 +140,7 @@ cell_texture_update(struct pipe_context *pipe, struct pipe_texture *texture)
|
|||
/**
|
||||
* Called via pipe->get_tex_surface()
|
||||
*/
|
||||
struct pipe_surface *
|
||||
static struct pipe_surface *
|
||||
cell_get_tex_surface(struct pipe_context *pipe,
|
||||
struct pipe_texture *pt,
|
||||
unsigned face, unsigned level, unsigned zslice)
|
||||
|
@ -258,3 +259,13 @@ cell_update_texture_mapping(struct cell_context *cell)
|
|||
cell->tex_map = pipe_surface_map(cell->tex_surf);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
cell_init_texture_functions(struct cell_context *cell)
|
||||
{
|
||||
cell->pipe.texture_create = cell_texture_create;
|
||||
cell->pipe.texture_release = cell_texture_release;
|
||||
cell->pipe.texture_update = cell_texture_update;
|
||||
cell->pipe.get_tex_surface = cell_get_tex_surface;
|
||||
}
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
#define CELL_TEXTURE_H
|
||||
|
||||
|
||||
struct pipe_context;
|
||||
struct cell_context;
|
||||
struct pipe_texture;
|
||||
|
||||
|
||||
|
@ -60,24 +60,12 @@ cell_texture(struct pipe_texture *pt)
|
|||
|
||||
|
||||
|
||||
extern struct pipe_texture *
|
||||
cell_texture_create(struct pipe_context *pipe,
|
||||
const struct pipe_texture *templat);
|
||||
|
||||
extern void
|
||||
cell_texture_release(struct pipe_context *pipe, struct pipe_texture **pt);
|
||||
|
||||
extern void
|
||||
cell_texture_update(struct pipe_context *pipe, struct pipe_texture *texture);
|
||||
|
||||
extern struct pipe_surface *
|
||||
cell_get_tex_surface(struct pipe_context *pipe,
|
||||
struct pipe_texture *pt,
|
||||
unsigned face, unsigned level, unsigned zslice);
|
||||
|
||||
|
||||
extern void
|
||||
cell_update_texture_mapping(struct cell_context *cell);
|
||||
|
||||
|
||||
#endif /* CELL_TEXTURE */
|
||||
extern void
|
||||
cell_init_texture_functions(struct cell_context *cell);
|
||||
|
||||
|
||||
#endif /* CELL_TEXTURE_H */
|
||||
|
|
Loading…
Reference in New Issue