projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/master' into gallium-sampler-view
[mesa.git]
/
src
/
gallium
/
drivers
/
svga
/
svga_screen_texture.h
diff --git
a/src/gallium/drivers/svga/svga_screen_texture.h
b/src/gallium/drivers/svga/svga_screen_texture.h
index 8cfdfea6937da2ce0db2d7d1c9aa5cf205fe471b..96d035b12d80e75ab07201aff6b5e70107dea2c5 100644
(file)
--- a/
src/gallium/drivers/svga/svga_screen_texture.h
+++ b/
src/gallium/drivers/svga/svga_screen_texture.h
@@
-29,6
+29,7
@@
#include "pipe/p_compiler.h"
#include "pipe/p_state.h"
#include "pipe/p_compiler.h"
#include "pipe/p_state.h"
+#include "util/u_inlines.h"
#include "svga_screen_cache.h"
struct pipe_context;
#include "svga_screen_cache.h"
struct pipe_context;
@@
-38,7
+39,7
@@
struct svga_winsys_surface;
enum SVGA3dSurfaceFormat;
enum SVGA3dSurfaceFormat;
-#define SVGA_MAX_TEXTURE_LEVELS 1
2 /* 2048x2048 */
+#define SVGA_MAX_TEXTURE_LEVELS 1
6
/**
/**
@@
-77,7
+78,7
@@
struct svga_texture
{
struct pipe_texture base;
{
struct pipe_texture base;
- boolean defined[6][
PIPE
_MAX_TEXTURE_LEVELS];
+ boolean defined[6][
SVGA
_MAX_TEXTURE_LEVELS];
struct svga_sampler_view *cached_view;
struct svga_sampler_view *cached_view;
@@
-171,8
+172,9
@@
svga_sampler_view_reference(struct svga_sampler_view **ptr, struct svga_sampler_
{
struct svga_sampler_view *old = *ptr;
{
struct svga_sampler_view *old = *ptr;
- if (pipe_reference(
(struct pipe_reference **)ptr
, &v->reference))
+ if (pipe_reference(
&(*ptr)->reference
, &v->reference))
svga_destroy_sampler_view_priv(old);
svga_destroy_sampler_view_priv(old);
+ *ptr = v;
}
extern void
}
extern void
@@
-184,6
+186,9
@@
svga_surface_needs_propagation(struct pipe_surface *surf);
extern void
svga_screen_init_texture_functions(struct pipe_screen *screen);
extern void
svga_screen_init_texture_functions(struct pipe_screen *screen);
+void
+svga_init_texture_functions(struct pipe_context *pipe);
+
enum SVGA3dSurfaceFormat
svga_translate_format(enum pipe_format format);
enum SVGA3dSurfaceFormat
svga_translate_format(enum pipe_format format);