projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
st/mesa: add some debug code in st_choose_format()
[mesa.git]
/
src
/
mesa
/
state_tracker
/
st_cb_bitmap.h
diff --git
a/src/mesa/state_tracker/st_cb_bitmap.h
b/src/mesa/state_tracker/st_cb_bitmap.h
index aae11d34c9222f935adafc1116900ee814519d1f..899f45e4f5dc475151bc0de3430314b62a234fb5 100644
(file)
--- a/
src/mesa/state_tracker/st_cb_bitmap.h
+++ b/
src/mesa/state_tracker/st_cb_bitmap.h
@@
-1,6
+1,6
@@
/**************************************************************************
*
/**************************************************************************
*
- * Copyright 2007
Tungsten Graphics, Inc., Cedar Park, Texas
.
+ * Copyright 2007
VMware, Inc
.
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
@@
-18,7
+18,7
@@
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
- * IN NO EVENT SHALL
TUNGSTEN GRAPHICS
AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * IN NO EVENT SHALL
VMWARE
AND/OR ITS SUPPLIERS BE LIABLE FOR
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@
-30,11
+30,15
@@
#define ST_CB_BITMAP_H
#define ST_CB_BITMAP_H
-extern void
-st_init_bitmap_functions(struct dd_function_table *functions);
+#include <stdbool.h>
+
+struct dd_function_table;
+struct st_context;
+struct gl_program;
+struct st_fragment_program;
extern void
extern void
-st_init_bitmap
(struct st_context *st
);
+st_init_bitmap
_functions(struct dd_function_table *functions
);
extern void
st_destroy_bitmap(struct st_context *st);
extern void
st_destroy_bitmap(struct st_context *st);
@@
-42,5
+46,9
@@
st_destroy_bitmap(struct st_context *st);
extern void
st_flush_bitmap_cache(struct st_context *st);
extern void
st_flush_bitmap_cache(struct st_context *st);
+extern const struct tgsi_token *
+st_get_bitmap_shader(const struct tgsi_token *tokens,
+ unsigned tex_target, unsigned sampler_index,
+ bool use_texcoord, bool swizzle_xxxx);
#endif /* ST_CB_BITMAP_H */
#endif /* ST_CB_BITMAP_H */