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/draw-vbuf-interface'
[mesa.git]
/
src
/
gallium
/
drivers
/
i915simple
/
i915_texture.c
diff --git
a/src/gallium/drivers/i915simple/i915_texture.c
b/src/gallium/drivers/i915simple/i915_texture.c
index 2f5459af67f70aad34fd1adde23791bc95345f62..b2ca3a2286bd0c132ecae580825c4b6254a05edf 100644
(file)
--- a/
src/gallium/drivers/i915simple/i915_texture.c
+++ b/
src/gallium/drivers/i915simple/i915_texture.c
@@
-34,7
+34,7
@@
#include "pipe/p_context.h"
#include "pipe/p_defines.h"
#include "pipe/p_inlines.h"
#include "pipe/p_context.h"
#include "pipe/p_defines.h"
#include "pipe/p_inlines.h"
-#include "pipe/
p_winsys
.h"
+#include "pipe/
internal/p_winsys_screen
.h"
#include "util/u_math.h"
#include "util/u_memory.h"
#include "util/u_math.h"
#include "util/u_memory.h"
@@
-606,8
+606,8
@@
i915_texture_create(struct pipe_screen *screen,
tex_size = tex->stride * tex->total_nblocksy;
tex->buffer = ws->buffer_create(ws, 64,
tex_size = tex->stride * tex->total_nblocksy;
tex->buffer = ws->buffer_create(ws, 64,
- PIPE_BUFFER_USAGE_PIXEL,
- tex_size);
+
PIPE_BUFFER_USAGE_PIXEL,
+
tex_size);
if (!tex->buffer)
goto fail;
if (!tex->buffer)
goto fail;
@@
-664,7
+664,6
@@
i915_get_tex_surface(struct pipe_screen *screen,
unsigned flags)
{
struct i915_texture *tex = (struct i915_texture *)pt;
unsigned flags)
{
struct i915_texture *tex = (struct i915_texture *)pt;
- struct pipe_winsys *ws = screen->winsys;
struct pipe_surface *ps;
unsigned offset; /* in bytes */
struct pipe_surface *ps;
unsigned offset; /* in bytes */
@@
-683,9
+682,7
@@
i915_get_tex_surface(struct pipe_screen *screen,
ps = CALLOC_STRUCT(pipe_surface);
if (ps) {
ps->refcount = 1;
ps = CALLOC_STRUCT(pipe_surface);
if (ps) {
ps->refcount = 1;
- ps->winsys = ws;
pipe_texture_reference(&ps->texture, pt);
pipe_texture_reference(&ps->texture, pt);
- pipe_buffer_reference(screen, &ps->buffer, tex->buffer);
ps->format = pt->format;
ps->width = pt->width[level];
ps->height = pt->height[level];
ps->format = pt->format;
ps->width = pt->width[level];
ps->height = pt->height[level];
@@
-757,7
+754,6
@@
i915_tex_surface_release(struct pipe_screen *screen,
}
pipe_texture_reference(&surf->texture, NULL);
}
pipe_texture_reference(&surf->texture, NULL);
- pipe_buffer_reference(screen, &surf->buffer, NULL);
FREE(surf);
}
FREE(surf);
}