projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mesa_7_7_branch'
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
r300
/
r300_context.h
diff --git
a/src/mesa/drivers/dri/r300/r300_context.h
b/src/mesa/drivers/dri/r300/r300_context.h
index 518d5cdbf4f5908a93ecc61091d9e81e411f70a0..546cd8ddde37b53e286bfbb26ead254840bb46a5 100644
(file)
--- a/
src/mesa/drivers/dri/r300/r300_context.h
+++ b/
src/mesa/drivers/dri/r300/r300_context.h
@@
-533,14
+533,19
@@
struct r300_context {
uint32_t fallback;
uint32_t fallback;
+ struct {
+ struct r300_vertex_program_code vp_code;
+ struct rX00_fragment_program_code fp_code;
+ } blit;
+
DECLARE_RENDERINPUTS(render_inputs_bitset);
};
#define R300_CONTEXT(ctx) ((r300ContextPtr)(ctx->DriverCtx))
DECLARE_RENDERINPUTS(render_inputs_bitset);
};
#define R300_CONTEXT(ctx) ((r300ContextPtr)(ctx->DriverCtx))
-extern void r300DestroyContext(__DRIcontext
Private
* driContextPriv);
+extern void r300DestroyContext(__DRIcontext * driContextPriv);
extern GLboolean r300CreateContext(const __GLcontextModes * glVisual,
extern GLboolean r300CreateContext(const __GLcontextModes * glVisual,
- __DRIcontext
Private
* driContextPriv,
+ __DRIcontext * driContextPriv,
void *sharedContextPrivate);
extern void r300InitShaderFuncs(struct dd_function_table *functions);
void *sharedContextPrivate);
extern void r300InitShaderFuncs(struct dd_function_table *functions);
@@
-549,6
+554,8
@@
extern void r300InitShaderFunctions(r300ContextPtr r300);
extern void r300InitDraw(GLcontext *ctx);
extern void r300InitDraw(GLcontext *ctx);
+extern void r300_init_texcopy_functions(struct dd_function_table *table);
+
#define r300PackFloat32 radeonPackFloat32
#define r300PackFloat24 radeonPackFloat24
#define r300PackFloat32 radeonPackFloat32
#define r300PackFloat24 radeonPackFloat24