llvmpipe: Split off vs stuff from lp_state_fs.c.
lp_state_fs.c is already too big without it.
This commit is contained in:
parent
c3b7406667
commit
3f36f4b051
|
@ -42,6 +42,7 @@ C_SOURCES = \
|
||||||
lp_state_sampler.c \
|
lp_state_sampler.c \
|
||||||
lp_state_surface.c \
|
lp_state_surface.c \
|
||||||
lp_state_vertex.c \
|
lp_state_vertex.c \
|
||||||
|
lp_state_vs.c \
|
||||||
lp_surface.c \
|
lp_surface.c \
|
||||||
lp_tex_cache.c \
|
lp_tex_cache.c \
|
||||||
lp_tex_sample.c \
|
lp_tex_sample.c \
|
||||||
|
|
|
@ -46,6 +46,7 @@ llvmpipe = env.ConvenienceLibrary(
|
||||||
'lp_state_sampler.c',
|
'lp_state_sampler.c',
|
||||||
'lp_state_surface.c',
|
'lp_state_surface.c',
|
||||||
'lp_state_vertex.c',
|
'lp_state_vertex.c',
|
||||||
|
'lp_state_vs.c',
|
||||||
'lp_surface.c',
|
'lp_surface.c',
|
||||||
'lp_tex_cache.c',
|
'lp_tex_cache.c',
|
||||||
'lp_tex_sample.c',
|
'lp_tex_sample.c',
|
||||||
|
|
|
@ -597,66 +597,6 @@ llvmpipe_delete_fs_state(struct pipe_context *pipe, void *fs)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void *
|
|
||||||
llvmpipe_create_vs_state(struct pipe_context *pipe,
|
|
||||||
const struct pipe_shader_state *templ)
|
|
||||||
{
|
|
||||||
struct llvmpipe_context *llvmpipe = llvmpipe_context(pipe);
|
|
||||||
struct lp_vertex_shader *state;
|
|
||||||
|
|
||||||
state = CALLOC_STRUCT(lp_vertex_shader);
|
|
||||||
if (state == NULL )
|
|
||||||
goto fail;
|
|
||||||
|
|
||||||
/* copy shader tokens, the ones passed in will go away.
|
|
||||||
*/
|
|
||||||
state->shader.tokens = tgsi_dup_tokens(templ->tokens);
|
|
||||||
if (state->shader.tokens == NULL)
|
|
||||||
goto fail;
|
|
||||||
|
|
||||||
state->draw_data = draw_create_vertex_shader(llvmpipe->draw, templ);
|
|
||||||
if (state->draw_data == NULL)
|
|
||||||
goto fail;
|
|
||||||
|
|
||||||
return state;
|
|
||||||
|
|
||||||
fail:
|
|
||||||
if (state) {
|
|
||||||
FREE( (void *)state->shader.tokens );
|
|
||||||
FREE( state->draw_data );
|
|
||||||
FREE( state );
|
|
||||||
}
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
llvmpipe_bind_vs_state(struct pipe_context *pipe, void *vs)
|
|
||||||
{
|
|
||||||
struct llvmpipe_context *llvmpipe = llvmpipe_context(pipe);
|
|
||||||
|
|
||||||
llvmpipe->vs = (const struct lp_vertex_shader *)vs;
|
|
||||||
|
|
||||||
draw_bind_vertex_shader(llvmpipe->draw,
|
|
||||||
(llvmpipe->vs ? llvmpipe->vs->draw_data : NULL));
|
|
||||||
|
|
||||||
llvmpipe->dirty |= LP_NEW_VS;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
llvmpipe_delete_vs_state(struct pipe_context *pipe, void *vs)
|
|
||||||
{
|
|
||||||
struct llvmpipe_context *llvmpipe = llvmpipe_context(pipe);
|
|
||||||
|
|
||||||
struct lp_vertex_shader *state =
|
|
||||||
(struct lp_vertex_shader *)vs;
|
|
||||||
|
|
||||||
draw_delete_vertex_shader(llvmpipe->draw, state->draw_data);
|
|
||||||
FREE( state );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
llvmpipe_set_constant_buffer(struct pipe_context *pipe,
|
llvmpipe_set_constant_buffer(struct pipe_context *pipe,
|
||||||
|
|
|
@ -0,0 +1,96 @@
|
||||||
|
/**************************************************************************
|
||||||
|
*
|
||||||
|
* Copyright 2009 VMware, Inc.
|
||||||
|
* 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.
|
||||||
|
*
|
||||||
|
**************************************************************************/
|
||||||
|
|
||||||
|
|
||||||
|
#include "pipe/p_defines.h"
|
||||||
|
#include "tgsi/tgsi_parse.h"
|
||||||
|
#include "util/u_memory.h"
|
||||||
|
#include "draw/draw_context.h"
|
||||||
|
|
||||||
|
#include "lp_context.h"
|
||||||
|
#include "lp_state.h"
|
||||||
|
|
||||||
|
|
||||||
|
void *
|
||||||
|
llvmpipe_create_vs_state(struct pipe_context *pipe,
|
||||||
|
const struct pipe_shader_state *templ)
|
||||||
|
{
|
||||||
|
struct llvmpipe_context *llvmpipe = llvmpipe_context(pipe);
|
||||||
|
struct lp_vertex_shader *state;
|
||||||
|
|
||||||
|
state = CALLOC_STRUCT(lp_vertex_shader);
|
||||||
|
if (state == NULL )
|
||||||
|
goto fail;
|
||||||
|
|
||||||
|
/* copy shader tokens, the ones passed in will go away.
|
||||||
|
*/
|
||||||
|
state->shader.tokens = tgsi_dup_tokens(templ->tokens);
|
||||||
|
if (state->shader.tokens == NULL)
|
||||||
|
goto fail;
|
||||||
|
|
||||||
|
state->draw_data = draw_create_vertex_shader(llvmpipe->draw, templ);
|
||||||
|
if (state->draw_data == NULL)
|
||||||
|
goto fail;
|
||||||
|
|
||||||
|
return state;
|
||||||
|
|
||||||
|
fail:
|
||||||
|
if (state) {
|
||||||
|
FREE( (void *)state->shader.tokens );
|
||||||
|
FREE( state->draw_data );
|
||||||
|
FREE( state );
|
||||||
|
}
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void
|
||||||
|
llvmpipe_bind_vs_state(struct pipe_context *pipe, void *vs)
|
||||||
|
{
|
||||||
|
struct llvmpipe_context *llvmpipe = llvmpipe_context(pipe);
|
||||||
|
|
||||||
|
llvmpipe->vs = (const struct lp_vertex_shader *)vs;
|
||||||
|
|
||||||
|
draw_bind_vertex_shader(llvmpipe->draw,
|
||||||
|
(llvmpipe->vs ? llvmpipe->vs->draw_data : NULL));
|
||||||
|
|
||||||
|
llvmpipe->dirty |= LP_NEW_VS;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void
|
||||||
|
llvmpipe_delete_vs_state(struct pipe_context *pipe, void *vs)
|
||||||
|
{
|
||||||
|
struct llvmpipe_context *llvmpipe = llvmpipe_context(pipe);
|
||||||
|
|
||||||
|
struct lp_vertex_shader *state =
|
||||||
|
(struct lp_vertex_shader *)vs;
|
||||||
|
|
||||||
|
draw_delete_vertex_shader(llvmpipe->draw, state->draw_data);
|
||||||
|
FREE( state );
|
||||||
|
}
|
Loading…
Reference in New Issue