projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/perrtblend'
[mesa.git]
/
src
/
mesa
/
state_tracker
/
st_format.h
diff --git
a/src/mesa/state_tracker/st_format.h
b/src/mesa/state_tracker/st_format.h
index 9d9e02fe9b62bb32b69ef247d628ce8c593111a2..7cddf5aa66a7c4fe5e0ea7a2ddb7a000cf627308 100644
(file)
--- a/
src/mesa/state_tracker/st_format.h
+++ b/
src/mesa/state_tracker/st_format.h
@@
-29,11
+29,12
@@
#ifndef ST_FORMAT_H
#define ST_FORMAT_H
#ifndef ST_FORMAT_H
#define ST_FORMAT_H
+#include "main/formats.h"
struct pipe_format_info
{
enum pipe_format format;
struct pipe_format_info
{
enum pipe_format format;
-
GLenum base
_format;
+
gl_format mesa
_format;
GLenum datatype;
GLubyte red_bits;
GLubyte green_bits;
GLenum datatype;
GLubyte red_bits;
GLubyte green_bits;
@@
-60,18
+61,22
@@
st_format_datatype(enum pipe_format format);
extern enum pipe_format
extern enum pipe_format
-st_mesa_format_to_pipe_format(GLuint mesaFormat);
+st_mesa_format_to_pipe_format(gl_format mesaFormat);
+
+extern gl_format
+st_pipe_format_to_mesa_format(enum pipe_format pipeFormat);
extern enum pipe_format
extern enum pipe_format
-st_choose_format(struct pipe_
context *pipe
, GLenum internalFormat,
+st_choose_format(struct pipe_
screen *screen
, GLenum internalFormat,
enum pipe_texture_target target, unsigned tex_usage);
extern enum pipe_format
enum pipe_texture_target target, unsigned tex_usage);
extern enum pipe_format
-st_choose_renderbuffer_format(struct pipe_context *pipe, GLenum internalFormat);
+st_choose_renderbuffer_format(struct pipe_screen *screen,
+ GLenum internalFormat);
-extern
const struct gl_texture_format *
+extern
gl_format
st_ChooseTextureFormat(GLcontext * ctx, GLint internalFormat,
GLenum format, GLenum type);
st_ChooseTextureFormat(GLcontext * ctx, GLint internalFormat,
GLenum format, GLenum type);