projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nv50: fix bogus error message about 3d surfaces
[mesa.git]
/
src
/
gallium
/
drivers
/
svga
/
svga_pipe_sampler.c
diff --git
a/src/gallium/drivers/svga/svga_pipe_sampler.c
b/src/gallium/drivers/svga/svga_pipe_sampler.c
index 82d525ca33f90fe93492f4b5ed6a7ad730c756c9..446fcc440782f5a2bae4d3ff2a5cec3701f91fb5 100644
(file)
--- a/
src/gallium/drivers/svga/svga_pipe_sampler.c
+++ b/
src/gallium/drivers/svga/svga_pipe_sampler.c
@@
-30,7
+30,7
@@
#include "tgsi/tgsi_parse.h"
#include "svga_context.h"
#include "tgsi/tgsi_parse.h"
#include "svga_context.h"
-#include "svga_
screen
_texture.h"
+#include "svga_
resource
_texture.h"
#include "svga_debug.h"
#include "svga_debug.h"
@@
-144,8
+144,9
@@
svga_create_sampler_state(struct pipe_context *pipe,
return cso;
}
return cso;
}
-static void svga_bind_sampler_states(struct pipe_context *pipe,
- unsigned num, void **sampler)
+static void
+svga_bind_fragment_sampler_states(struct pipe_context *pipe,
+ unsigned num, void **sampler)
{
struct svga_context *svga = svga_context(pipe);
unsigned i;
{
struct svga_context *svga = svga_context(pipe);
unsigned i;
@@
-178,7
+179,7
@@
static void svga_delete_sampler_state(struct pipe_context *pipe,
static struct pipe_sampler_view *
svga_create_sampler_view(struct pipe_context *pipe,
static struct pipe_sampler_view *
svga_create_sampler_view(struct pipe_context *pipe,
- struct pipe_
textur
e *texture,
+ struct pipe_
resourc
e *texture,
const struct pipe_sampler_view *templ)
{
struct pipe_sampler_view *view = CALLOC_STRUCT(pipe_sampler_view);
const struct pipe_sampler_view *templ)
{
struct pipe_sampler_view *view = CALLOC_STRUCT(pipe_sampler_view);
@@
-187,7
+188,7
@@
svga_create_sampler_view(struct pipe_context *pipe,
*view = *templ;
view->reference.count = 1;
view->texture = NULL;
*view = *templ;
view->reference.count = 1;
view->texture = NULL;
- pipe_
textur
e_reference(&view->texture, texture);
+ pipe_
resourc
e_reference(&view->texture, texture);
view->context = pipe;
}
view->context = pipe;
}
@@
-199,13
+200,14
@@
static void
svga_sampler_view_destroy(struct pipe_context *pipe,
struct pipe_sampler_view *view)
{
svga_sampler_view_destroy(struct pipe_context *pipe,
struct pipe_sampler_view *view)
{
- pipe_
textur
e_reference(&view->texture, NULL);
+ pipe_
resourc
e_reference(&view->texture, NULL);
FREE(view);
}
FREE(view);
}
-static void svga_set_sampler_views(struct pipe_context *pipe,
- unsigned num,
- struct pipe_sampler_view **views)
+static void
+svga_set_fragment_sampler_views(struct pipe_context *pipe,
+ unsigned num,
+ struct pipe_sampler_view **views)
{
struct svga_context *svga = svga_context(pipe);
unsigned flag_1d = 0;
{
struct svga_context *svga = svga_context(pipe);
unsigned flag_1d = 0;
@@
-256,9
+258,9
@@
static void svga_set_sampler_views(struct pipe_context *pipe,
void svga_init_sampler_functions( struct svga_context *svga )
{
svga->pipe.create_sampler_state = svga_create_sampler_state;
void svga_init_sampler_functions( struct svga_context *svga )
{
svga->pipe.create_sampler_state = svga_create_sampler_state;
- svga->pipe.bind_fragment_sampler_states = svga_bind_sampler_states;
+ svga->pipe.bind_fragment_sampler_states = svga_bind_
fragment_
sampler_states;
svga->pipe.delete_sampler_state = svga_delete_sampler_state;
svga->pipe.delete_sampler_state = svga_delete_sampler_state;
- svga->pipe.set_fragment_sampler_views = svga_set_sampler_views;
+ svga->pipe.set_fragment_sampler_views = svga_set_
fragment_
sampler_views;
svga->pipe.create_sampler_view = svga_create_sampler_view;
svga->pipe.sampler_view_destroy = svga_sampler_view_destroy;
}
svga->pipe.create_sampler_view = svga_create_sampler_view;
svga->pipe.sampler_view_destroy = svga_sampler_view_destroy;
}