diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-01-16 13:14:19 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-01-16 13:14:19 +1100 |
| commit | 3119e9a14b66fcfb08fcc3563602273dd2e1893c (patch) | |
| tree | 74ff685faec3430b66d70522b6ed717f57e54f00 /src/mesa/pipe/p_context.h | |
| parent | 9de335f5807553bc9251931ba3e80c4b454b5818 (diff) | |
| parent | 587e2becc237bc1c900a1c0ba114a1a0192690ff (diff) | |
Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
Conflicts:
src/mesa/pipe/Makefile
Diffstat (limited to 'src/mesa/pipe/p_context.h')
| -rw-r--r-- | src/mesa/pipe/p_context.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/mesa/pipe/p_context.h b/src/mesa/pipe/p_context.h index 1afb38a868..7a18d48865 100644 --- a/src/mesa/pipe/p_context.h +++ b/src/mesa/pipe/p_context.h @@ -29,7 +29,7 @@ #define PIPE_CONTEXT_H #include "p_state.h" -#include <stdint.h> + struct pipe_state_cache; @@ -97,7 +97,7 @@ struct pipe_context { boolean (*get_query_result)(struct pipe_context *pipe, struct pipe_query *q, boolean wait, - uint64_t *result); + uint64 *result); /* * State functions @@ -192,11 +192,6 @@ struct pipe_context { struct pipe_surface *ps, uint x, uint y, uint w, uint h, const void *p, int src_stride); - /* XXX temporary here, move these to softpipe */ - void (*get_tile_rgba)(struct pipe_context *pipe, struct pipe_surface *ps, - uint x, uint y, uint w, uint h, float *p); - void (*put_tile_rgba)(struct pipe_context *pipe, struct pipe_surface *ps, - uint x, uint y, uint w, uint h, const float *p); /* |