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

Revert "llvmpipe: plug in dummy pipe_context::set_vertex_sampler_textures function"

Browse Source 
This reverts commit 792888121b.

We're instead returning 0 for the PIPE_CAP_MAX_VERTEX_TEXTURE_UNITS query.
This commit is contained in:
Brian Paul
2009-12-02 12:20:15 -07:00
parent f42192e783
commit d5e5909f17
3 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/llvmpipe/lp_context.c
+1 -2
View File
@@ -205,8 +205,7 @@ llvmpipe_create( struct pipe_screen *screen )
llvmpipe->pipe.set_framebuffer_state = llvmpipe_set_framebuffer_state;
llvmpipe->pipe.set_polygon_stipple = llvmpipe_set_polygon_stipple;
llvmpipe->pipe.set_scissor_state = llvmpipe_set_scissor_state;
llvmpipe->pipe.set_fragment_sampler_textures = llvmpipe_set_fragment_sampler_textures;
llvmpipe->pipe.set_vertex_sampler_textures = llvmpipe_set_vertex_sampler_textures;
llvmpipe->pipe.set_fragment_sampler_textures = llvmpipe_set_sampler_textures;
llvmpipe->pipe.set_viewport_state = llvmpipe_set_viewport_state;
llvmpipe->pipe.set_vertex_buffers = llvmpipe_set_vertex_buffers;
src/gallium/drivers/llvmpipe/lp_state.h
+3 -7
View File
@@ -168,13 +168,9 @@ void llvmpipe_set_polygon_stipple( struct pipe_context *,
void llvmpipe_set_scissor_state( struct pipe_context *,
const struct pipe_scissor_state * );
void llvmpipe_set_fragment_sampler_textures( struct pipe_context *,
unsigned num,
struct pipe_texture ** );
void llvmpipe_set_vertex_sampler_textures( struct pipe_context *,
unsigned num,
struct pipe_texture ** );
void llvmpipe_set_sampler_textures( struct pipe_context *,
unsigned num,
struct pipe_texture ** );
void llvmpipe_set_viewport_state( struct pipe_context *,
const struct pipe_viewport_state * );
src/gallium/drivers/llvmpipe/lp_state_sampler.c
+2 -12
View File
@@ -78,9 +78,8 @@ llvmpipe_bind_sampler_states(struct pipe_context *pipe,
void
llvmpipe_set_fragment_sampler_textures(struct pipe_context *pipe,
unsigned num,
struct pipe_texture **texture)
llvmpipe_set_sampler_textures(struct pipe_context *pipe,
unsigned num, struct pipe_texture **texture)
{
struct llvmpipe_context *llvmpipe = llvmpipe_context(pipe);
uint i;
@@ -117,15 +116,6 @@ llvmpipe_set_fragment_sampler_textures(struct pipe_context *pipe,
}
void
llvmpipe_set_vertex_sampler_textures(struct pipe_context *pipe,
unsigned num,
struct pipe_texture **texture)
{
/* XXX to do */
}
void
llvmpipe_delete_sampler_state(struct pipe_context *pipe,
void *sampler)