projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: add bool param to _mesa_free_context_data
[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 43fa59b1006d7236f09c90e9200e4f55782c564e..0a8e3bc921f973645f4c7d95cbd0b93c1ad57908 100644
(file)
--- a/
src/mesa/state_tracker/st_format.h
+++ b/
src/mesa/state_tracker/st_format.h
@@
-1,6
+1,6
@@
/**************************************************************************
*
/**************************************************************************
*
- * Copyright 2007
Tungsten Graphics, Inc., Cedar Park, Texas
.
+ * Copyright 2007
VMware, Inc
.
* Copyright (c) 2010 VMware, Inc.
* All Rights Reserved.
*
* Copyright (c) 2010 VMware, Inc.
* All Rights Reserved.
*
@@
-19,7
+19,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.
@@
-31,49
+31,57
@@
#define ST_FORMAT_H
#include "main/formats.h"
#define ST_FORMAT_H
#include "main/formats.h"
-#include "main/
mtypes
.h"
+#include "main/
glheader
.h"
-#include "pipe/p_defines.h"
#include "pipe/p_format.h"
#include "pipe/p_format.h"
-struct pipe_screen;
+#ifdef __cplusplus
+extern "C" {
+#endif
-extern GLenum
-st
_format_datatype(enum pipe_format format)
;
+struct gl_context;
+st
ruct pipe_screen
;
extern enum pipe_format
extern enum pipe_format
-st_mesa_format_to_pipe_format(
gl
_format mesaFormat);
+st_mesa_format_to_pipe_format(
const struct st_context *st, mesa
_format mesaFormat);
-extern
gl
_format
+extern
mesa
_format
st_pipe_format_to_mesa_format(enum pipe_format pipeFormat);
extern enum pipe_format
st_pipe_format_to_mesa_format(enum pipe_format pipeFormat);
extern enum pipe_format
-st_choose_format(struct pipe_screen *screen, GLenum internalFormat,
+st_choose_format(struct st_context *st, GLenum internalFormat,
+ GLenum format, GLenum type,
enum pipe_texture_target target, unsigned sample_count,
enum pipe_texture_target target, unsigned sample_count,
- unsigned tex_usage);
+ unsigned storage_sample_count,
+ unsigned bindings, bool swap_bytes, bool allow_dxt);
extern enum pipe_format
extern enum pipe_format
-st_choose_renderbuffer_format(struct pipe_screen *screen,
- GLenum internalFormat, unsigned sample_count);
+st_choose_renderbuffer_format(struct st_context *st,
+ GLenum internalFormat, unsigned sample_count,
+ unsigned storage_sample_count);
+extern enum pipe_format
+st_choose_matching_format(struct st_context *st, unsigned bind,
+ GLenum format, GLenum type, GLboolean swapBytes);
-gl_format
-st_ChooseTextureFormat_renderable(struct gl_context *ctx, GLint internalFormat,
- GLenum format, GLenum type, GLboolean renderable);
-
-extern gl_format
-st_ChooseTextureFormat(struct gl_context * ctx, GLint internalFormat,
+extern mesa_format
+st_ChooseTextureFormat(struct gl_context * ctx, GLenum target,
+ GLint internalFormat,
GLenum format, GLenum type);
GLenum format, GLenum type);
+void
+st_QueryInternalFormat(struct gl_context *ctx, GLenum target,
+ GLenum internalFormat, GLenum pname, GLint *params);
-extern GLboolean
-st_equal_formats(enum pipe_format pFormat, GLenum format, GLenum type);
+extern void
+st_translate_color(const union gl_color_union *colorIn,
+ union pipe_color_union *colorOut,
+ GLenum baseFormat, GLboolean is_integer);
-/* can we use a sampler view to translate these formats
- only used to make TFP so far */
-extern GLboolean
-st_sampler_compat_formats(enum pipe_format format1, enum pipe_format format2);
+#ifdef __cplusplus
+}
+#endif
#endif /* ST_FORMAT_H */
#endif /* ST_FORMAT_H */