projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nvc0/ir: clarify recursion fix to finding first tex uses
[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 1c1f5965f667a4314597b5896cf604333d102470..90e00e8ebf62857ffe81d217f9045c8e096cbc75 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.
@@
-39,49
+39,42
@@
struct gl_context;
struct pipe_screen;
struct gl_context;
struct pipe_screen;
-extern GLenum
-st_format_datatype(enum pipe_format format);
-
extern enum pipe_format
extern enum pipe_format
-st_mesa_format_to_pipe_format(
gl
_format mesaFormat);
+st_mesa_format_to_pipe_format(
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,
GLenum format, GLenum type,
enum pipe_texture_target target, unsigned sample_count,
- unsigned bindings);
+ unsigned bindings
, boolean allow_dxt
);
extern enum pipe_format
extern enum pipe_format
-st_choose_renderbuffer_format(struct
pipe_screen *screen
,
+st_choose_renderbuffer_format(struct
st_context *st
,
GLenum internalFormat, unsigned sample_count);
GLenum internalFormat, unsigned 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);
+size_t
+st_QuerySamplesForFormat(struct gl_context *ctx, GLenum target,
+ GLenum internalFormat, int samples[16]);
-extern GLboolean
-st_equal_formats(enum pipe_format pFormat, GLenum format, GLenum type);
-
-/* 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);
extern void
extern void
-st_translate_color(const
GLfloat colorIn[4], GLenum baseFormat
,
- GLfloat colorOut[4]);
-
+st_translate_color(const
union gl_color_union *colorIn
,
+ union pipe_color_union *colorOut,
+ GLenum baseFormat, GLboolean is_integer);
#endif /* ST_FORMAT_H */
#endif /* ST_FORMAT_H */