KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cell: init shader-related functions in cell_init_shader_functions()

This commit is contained in:
Brian 2008-02-20 14:30:50 -07:00
parent 9e57e70b42
commit 6468347375
4 changed files with 55 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/gallium/drivers/cell/ppu/cell_context.c
View File

@ -199,16 +199,6 @@ cell_create_context(struct pipe_winsys *winsys, struct cell_winsys *cws)
/* state setters */
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;
cell->pipe.create_vs_state = cell_create_vs_state;
cell->pipe.bind_vs_state = cell_bind_vs_state;
cell->pipe.delete_vs_state = cell_delete_vs_state;
cell->pipe.set_constant_buffer = cell_set_constant_buffer;
cell->pipe.set_vertex_buffer = cell_set_vertex_buffer;
cell->pipe.set_vertex_element = cell_set_vertex_element;
@ -225,6 +215,7 @@ cell_create_context(struct pipe_winsys *winsys, struct cell_winsys *cws)
#endif
cell_init_state_functions(cell);
cell_init_shader_functions(cell);
cell_init_surface_functions(cell);
cell_init_texture_functions(cell);

1
src/gallium/drivers/cell/ppu/cell_pipe_state.c
View File

@ -314,7 +314,6 @@ cell_init_state_functions(struct cell_context *cell)
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;

50
src/gallium/drivers/cell/ppu/cell_state.h
View File

@ -1,3 +1,29 @@
/**************************************************************************
*
* 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.
*
**************************************************************************/
#ifndef CELL_STATE_H
@ -22,23 +48,6 @@
#define CELL_NEW_VERTEX_INFO 0x8000
void *cell_create_fs_state(struct pipe_context *,
const struct pipe_shader_state *);
void cell_bind_fs_state(struct pipe_context *, void *);
void cell_delete_fs_state(struct pipe_context *, void *);
void *cell_create_vs_state(struct pipe_context *,
const struct pipe_shader_state *);
void cell_bind_vs_state(struct pipe_context *, void *);
void cell_delete_vs_state(struct pipe_context *, void *);
void
cell_set_constant_buffer(struct pipe_context *pipe,
uint shader, uint index,
const struct pipe_constant_buffer *buf);
void cell_set_vertex_element(struct pipe_context *,
unsigned index,
const struct pipe_vertex_element *);
@ -49,4 +58,9 @@ void cell_set_vertex_buffer(struct pipe_context *,
void cell_update_derived( struct cell_context *softpipe );
#endif
void
cell_init_shader_functions(struct cell_context *cell);
#endif /* CELL_STATE_H */

29
src/gallium/drivers/cell/ppu/cell_state_fs.c
View File

@ -41,7 +41,7 @@
#include "cell_state.h"
void *
static void *
cell_create_fs_state(struct pipe_context *pipe,
const struct pipe_shader_state *templ)
{
@ -80,7 +80,7 @@ cell_create_fs_state(struct pipe_context *pipe,
}
void
static void
cell_bind_fs_state(struct pipe_context *pipe, void *fs)
{
struct cell_context *cell = cell_context(pipe);
@ -91,7 +91,7 @@ cell_bind_fs_state(struct pipe_context *pipe, void *fs)
}
void
static void
cell_delete_fs_state(struct pipe_context *pipe, void *fs)
{
struct cell_fragment_shader_state *state =
@ -101,7 +101,7 @@ cell_delete_fs_state(struct pipe_context *pipe, void *fs)
}
void *
static void *
cell_create_vs_state(struct pipe_context *pipe,
const struct pipe_shader_state *templ)
{
@ -124,7 +124,7 @@ cell_create_vs_state(struct pipe_context *pipe,
}
void
static void
cell_bind_vs_state(struct pipe_context *pipe, void *vs)
{
struct cell_context *cell = cell_context(pipe);
@ -137,7 +137,7 @@ cell_bind_vs_state(struct pipe_context *pipe, void *vs)
}
void
static void
cell_delete_vs_state(struct pipe_context *pipe, void *vs)
{
struct cell_context *cell = cell_context(pipe);
@ -150,7 +150,7 @@ cell_delete_vs_state(struct pipe_context *pipe, void *vs)
}
void
static void
cell_set_constant_buffer(struct pipe_context *pipe,
uint shader, uint index,
const struct pipe_constant_buffer *buf)
@ -169,3 +169,18 @@ cell_set_constant_buffer(struct pipe_context *pipe,
cell->dirty |= CELL_NEW_CONSTANTS;
}
void
cell_init_shader_functions(struct cell_context *cell)
{
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;
cell->pipe.create_vs_state = cell_create_vs_state;
cell->pipe.bind_vs_state = cell_bind_vs_state;
cell->pipe.delete_vs_state = cell_delete_vs_state;
cell->pipe.set_constant_buffer = cell_set_constant_buffer;
}