projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gallium/radeon: fix warnings
[mesa.git]
/
src
/
gallium
/
drivers
/
r300
/
r300_texture.h
diff --git
a/src/gallium/drivers/r300/r300_texture.h
b/src/gallium/drivers/r300/r300_texture.h
index c4588a0c90b7852dd7bf07fea939a1ca6360e285..213bdffc2ed1c3e80887c35e42328013a2fb8ece 100644
(file)
--- a/
src/gallium/drivers/r300/r300_texture.h
+++ b/
src/gallium/drivers/r300/r300_texture.h
@@
-27,26
+27,25
@@
#include "pipe/p_format.h"
struct pipe_screen;
#include "pipe/p_format.h"
struct pipe_screen;
+struct pipe_context;
struct pipe_resource;
struct winsys_handle;
struct r300_texture_format_state;
struct r300_texture_desc;
struct pipe_resource;
struct winsys_handle;
struct r300_texture_format_state;
struct r300_texture_desc;
-struct r300_
textur
e;
+struct r300_
resourc
e;
struct r300_screen;
unsigned r300_get_swizzle_combined(const unsigned char *swizzle_format,
struct r300_screen;
unsigned r300_get_swizzle_combined(const unsigned char *swizzle_format,
- const unsigned char *swizzle_view);
+ const unsigned char *swizzle_view,
+ boolean dxtc_swizzle);
uint32_t r300_translate_texformat(enum pipe_format format,
const unsigned char *swizzle_view,
uint32_t r300_translate_texformat(enum pipe_format format,
const unsigned char *swizzle_view,
- boolean is_r500);
+ boolean is_r500,
+ boolean dxtc_swizzle);
uint32_t r500_tx_format_msb_bit(enum pipe_format format);
uint32_t r500_tx_format_msb_bit(enum pipe_format format);
-void r300_texture_reinterpret_format(struct pipe_screen *screen,
- struct pipe_resource *tex,
- enum pipe_format new_format);
-
boolean r300_is_colorbuffer_format_supported(enum pipe_format format);
boolean r300_is_zs_format_supported(enum pipe_format format);
boolean r300_is_colorbuffer_format_supported(enum pipe_format format);
boolean r300_is_zs_format_supported(enum pipe_format format);
@@
-54,10
+53,17
@@
boolean r300_is_zs_format_supported(enum pipe_format format);
boolean r300_is_sampler_format_supported(enum pipe_format format);
void r300_texture_setup_format_state(struct r300_screen *screen,
boolean r300_is_sampler_format_supported(enum pipe_format format);
void r300_texture_setup_format_state(struct r300_screen *screen,
- struct r300_texture_desc *desc,
+ struct r300_resource *tex,
+ enum pipe_format format,
unsigned level,
unsigned level,
+ unsigned width0_override,
+ unsigned height0_override,
struct r300_texture_format_state *out);
struct r300_texture_format_state *out);
+boolean r300_resource_get_handle(struct pipe_screen* screen,
+ struct pipe_resource *texture,
+ struct winsys_handle *whandle);
+
struct pipe_resource*
r300_texture_from_handle(struct pipe_screen* screen,
const struct pipe_resource* base,
struct pipe_resource*
r300_texture_from_handle(struct pipe_screen* screen,
const struct pipe_resource* base,
@@
-67,14
+73,16
@@
struct pipe_resource*
r300_texture_create(struct pipe_screen* screen,
const struct pipe_resource* templ);
r300_texture_create(struct pipe_screen* screen,
const struct pipe_resource* templ);
+struct pipe_surface* r300_create_surface_custom(struct pipe_context * ctx,
+ struct pipe_resource* texture,
+ const struct pipe_surface *surf_tmpl,
+ unsigned width0_override,
+ unsigned height0_override);
-struct pipe_surface* r300_get_tex_surface(struct pipe_screen* screen,
- struct pipe_resource* texture,
- unsigned face,
- unsigned level,
- unsigned zslice,
- unsigned flags);
+struct pipe_surface* r300_create_surface(struct pipe_context *ctx,
+ struct pipe_resource* texture,
+ const struct pipe_surface *surf_tmpl);
-void r300_
tex_surface_destroy(
struct pipe_surface* s);
+void r300_
surface_destroy(struct pipe_context *ctx,
struct pipe_surface* s);
#endif /* R300_TEXTURE_H */
#endif /* R300_TEXTURE_H */