projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/master' into nv50-compiler
[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 a545a0f221216dc0a00bbbc71ef3c0fb74838749..c4588a0c90b7852dd7bf07fea939a1ca6360e285 100644
(file)
--- a/
src/gallium/drivers/r300/r300_texture.h
+++ b/
src/gallium/drivers/r300/r300_texture.h
@@
-23,17
+23,25
@@
#ifndef R300_TEXTURE_H
#define R300_TEXTURE_H
#ifndef R300_TEXTURE_H
#define R300_TEXTURE_H
-#include "util/u_format.h"
-
-#include "r300_reg.h"
-
+#include "pipe/p_compiler.h"
+#include "pipe/p_format.h"
+
+struct pipe_screen;
+struct pipe_resource;
+struct winsys_handle;
+struct r300_texture_format_state;
+struct r300_texture_desc;
struct r300_texture;
struct r300_texture;
+struct r300_screen;
+
+unsigned r300_get_swizzle_combined(const unsigned char *swizzle_format,
+ const unsigned char *swizzle_view);
-unsigned r300_texture_get_stride(struct r300_screen* screen,
- struct r300_texture* tex, unsigned level);
+uint32_t r300_translate_texformat(enum pipe_format format,
+ const unsigned char *swizzle_view,
+ boolean is_r500);
-unsigned r300_texture_get_offset(struct r300_texture* tex, unsigned level,
- unsigned zslice, unsigned face);
+uint32_t r500_tx_format_msb_bit(enum pipe_format format);
void r300_texture_reinterpret_format(struct pipe_screen *screen,
struct pipe_resource *tex,
void r300_texture_reinterpret_format(struct pipe_screen *screen,
struct pipe_resource *tex,
@@
-45,6
+53,10
@@
boolean r300_is_zs_format_supported(enum pipe_format format);
boolean r300_is_sampler_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,
+ struct r300_texture_desc *desc,
+ unsigned level,
+ struct r300_texture_format_state *out);
struct pipe_resource*
r300_texture_from_handle(struct pipe_screen* screen,
struct pipe_resource*
r300_texture_from_handle(struct pipe_screen* screen,
@@
-53,7
+65,7
@@
r300_texture_from_handle(struct pipe_screen* screen,
struct pipe_resource*
r300_texture_create(struct pipe_screen* screen,
struct pipe_resource*
r300_texture_create(struct pipe_screen* screen,
- const struct pipe_resource* templ
ate
);
+ const struct pipe_resource* templ);
struct pipe_surface* r300_get_tex_surface(struct pipe_screen* screen,
struct pipe_surface* r300_get_tex_surface(struct pipe_screen* screen,