projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '7.8'
[mesa.git]
/
src
/
gallium
/
state_trackers
/
vega
/
st_inlines.h
diff --git
a/src/gallium/state_trackers/vega/st_inlines.h
b/src/gallium/state_trackers/vega/st_inlines.h
index 1f331dfcdb722676b3c72f81d66fced779633c98..4d12a4efdd627f35eed9f6298d07392f12f83d2c 100644
(file)
--- a/
src/gallium/state_trackers/vega/st_inlines.h
+++ b/
src/gallium/state_trackers/vega/st_inlines.h
@@
-38,7
+38,7
@@
#include "pipe/p_context.h"
#include "pipe/p_screen.h"
#include "pipe/p_defines.h"
#include "pipe/p_context.h"
#include "pipe/p_screen.h"
#include "pipe/p_defines.h"
-#include "
pipe/p
_inlines.h"
+#include "
util/u
_inlines.h"
#include "pipe/p_state.h"
static INLINE struct pipe_transfer *
#include "pipe/p_state.h"
static INLINE struct pipe_transfer *
@@
-51,17
+51,15
@@
st_cond_flush_get_tex_transfer(struct vg_context *st,
unsigned int x, unsigned int y,
unsigned int w, unsigned int h)
{
unsigned int x, unsigned int y,
unsigned int w, unsigned int h)
{
- struct pipe_screen *screen = st->pipe->screen;
struct pipe_context *pipe = st->pipe;
unsigned referenced =
pipe->is_texture_referenced(pipe, pt, face, level);
if (referenced && ((referenced & PIPE_REFERENCED_FOR_WRITE) ||
struct pipe_context *pipe = st->pipe;
unsigned referenced =
pipe->is_texture_referenced(pipe, pt, face, level);
if (referenced && ((referenced & PIPE_REFERENCED_FOR_WRITE) ||
- usage == PIPE_TRANSFER_WRITE ||
- usage == PIPE_TRANSFER_READ_WRITE))
+ (usage & PIPE_TRANSFER_WRITE)))
vgFlush();
vgFlush();
- return
screen->get_tex_transfer(screen
, pt, face, level, zslice, usage,
+ return
pipe->get_tex_transfer(pipe
, pt, face, level, zslice, usage,
x, y, w, h);
}
x, y, w, h);
}
@@
-75,10
+73,10
@@
st_no_flush_get_tex_transfer(struct vg_context *st,
unsigned int x, unsigned int y,
unsigned int w, unsigned int h)
{
unsigned int x, unsigned int y,
unsigned int w, unsigned int h)
{
- struct pipe_
screen *screen = st->pipe->screen
;
+ struct pipe_
context *pipe = st->pipe
;
- return
screen->get_tex_transfer(screen
, pt, face, level,
-
zslice, usage, x, y, w, h);
+ return
pipe->get_tex_transfer(pipe
, pt, face, level,
+ zslice, usage, x, y, w, h);
}
static INLINE void *
}
static INLINE void *