projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nouveau: relax fence emit space assert
[mesa.git]
/
src
/
gallium
/
drivers
/
nouveau
/
nouveau_context.h
diff --git
a/src/gallium/drivers/nouveau/nouveau_context.h
b/src/gallium/drivers/nouveau/nouveau_context.h
index c2ba0159afecd21c18d9a68ebd703e26bf025b54..decb2714ede041f20b63e09f54dafc1b63cb4864 100644
(file)
--- a/
src/gallium/drivers/nouveau/nouveau_context.h
+++ b/
src/gallium/drivers/nouveau/nouveau_context.h
@@
-6,6
+6,8
@@
#define NOUVEAU_MAX_SCRATCH_BUFS 4
#define NOUVEAU_MAX_SCRATCH_BUFS 4
+struct nv04_resource;
+
struct nouveau_context {
struct pipe_context pipe;
struct nouveau_screen *screen;
struct nouveau_context {
struct pipe_context pipe;
struct nouveau_screen *screen;
@@
-13,7
+15,7
@@
struct nouveau_context {
struct nouveau_client *client;
struct nouveau_pushbuf *pushbuf;
struct nouveau_client *client;
struct nouveau_pushbuf *pushbuf;
- bool
ean
vbo_dirty;
+ bool vbo_dirty;
void (*copy_data)(struct nouveau_context *,
struct nouveau_bo *dst, unsigned, unsigned,
void (*copy_data)(struct nouveau_context *,
struct nouveau_bo *dst, unsigned, unsigned,
@@
-23,8
+25,7
@@
struct nouveau_context {
unsigned, const void *);
/* base, size refer to the whole constant buffer */
void (*push_cb)(struct nouveau_context *,
unsigned, const void *);
/* base, size refer to the whole constant buffer */
void (*push_cb)(struct nouveau_context *,
- struct nouveau_bo *, unsigned domain,
- unsigned base, unsigned size,
+ struct nv04_resource *,
unsigned offset, unsigned words, const uint32_t *);
/* @return: @ref reduced by nr of references found in context */
unsigned offset, unsigned words, const uint32_t *);
/* @return: @ref reduced by nr of references found in context */
@@
-53,7
+54,7
@@
struct nouveau_context {
} stats;
};
} stats;
};
-static
INLINE
struct nouveau_context *
+static
inline
struct nouveau_context *
nouveau_context(struct pipe_context *pipe)
{
return (struct nouveau_context *)pipe;
nouveau_context(struct pipe_context *pipe)
{
return (struct nouveau_context *)pipe;
@@
-69,7
+70,7
@@
nouveau_scratch_runout_release(struct nouveau_context *);
* because we don't want to un-bo_ref each allocation every time. This is less
* work, and we need the wrap index anyway for extreme situations.
*/
* because we don't want to un-bo_ref each allocation every time. This is less
* work, and we need the wrap index anyway for extreme situations.
*/
-static
INLINE
void
+static
inline
void
nouveau_scratch_done(struct nouveau_context *nv)
{
nv->scratch.wrap = nv->scratch.id;
nouveau_scratch_done(struct nouveau_context *nv)
{
nv->scratch.wrap = nv->scratch.id;
@@
-84,7
+85,7
@@
void *
nouveau_scratch_get(struct nouveau_context *, unsigned size, uint64_t *gpu_addr,
struct nouveau_bo **);
nouveau_scratch_get(struct nouveau_context *, unsigned size, uint64_t *gpu_addr,
struct nouveau_bo **);
-static
INLINE
void
+static
inline
void
nouveau_context_destroy(struct nouveau_context *ctx)
{
int i;
nouveau_context_destroy(struct nouveau_context *ctx)
{
int i;
@@
-96,7
+97,7
@@
nouveau_context_destroy(struct nouveau_context *ctx)
FREE(ctx);
}
FREE(ctx);
}
-static
INLINE
void
+static
inline
void
nouveau_context_update_frame_stats(struct nouveau_context *nv)
{
nv->stats.buf_cache_frame <<= 1;
nouveau_context_update_frame_stats(struct nouveau_context *nv)
{
nv->stats.buf_cache_frame <<= 1;
@@
-104,7
+105,7
@@
nouveau_context_update_frame_stats(struct nouveau_context *nv)
nv->stats.buf_cache_count = 0;
nv->stats.buf_cache_frame |= 1;
if ((nv->stats.buf_cache_frame & 0xf) == 0xf)
nv->stats.buf_cache_count = 0;
nv->stats.buf_cache_frame |= 1;
if ((nv->stats.buf_cache_frame & 0xf) == 0xf)
- nv->screen->hint_buf_keep_sysmem_copy =
TRUE
;
+ nv->screen->hint_buf_keep_sysmem_copy =
true
;
}
}
}
}