projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i965/meta: Fix typo in comment
[mesa.git]
/
src
/
mesa
/
state_tracker
/
st_cb_fbo.h
diff --git
a/src/mesa/state_tracker/st_cb_fbo.h
b/src/mesa/state_tracker/st_cb_fbo.h
index bea6eb89c3ecf0b7782df89757c37bc7efd7af6a..f3b310b07b7cc739b513b39ea8a84aab9d912781 100644
(file)
--- a/
src/mesa/state_tracker/st_cb_fbo.h
+++ b/
src/mesa/state_tracker/st_cb_fbo.h
@@
-1,6
+1,6
@@
/**************************************************************************
*
/**************************************************************************
*
- * Copyright 2007
Tungsten Graphics, Inc., Cedar Park, Texas
.
+ * Copyright 2007
VMware, Inc
.
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
@@
-18,7
+18,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.
@@
-29,6
+29,15
@@
#ifndef ST_CB_FBO_H
#define ST_CB_FBO_H
#ifndef ST_CB_FBO_H
#define ST_CB_FBO_H
+#include "main/compiler.h"
+#include "main/glheader.h"
+#include "main/mtypes.h"
+
+#include "pipe/p_compiler.h"
+#include "pipe/p_format.h"
+
+struct dd_function_table;
+struct pipe_context;
/**
* Derived renderbuffer class. Just need to add a pointer to the
/**
* Derived renderbuffer class. Just need to add a pointer to the
@@
-37,28
+46,26
@@
struct st_renderbuffer
{
struct gl_renderbuffer Base;
struct st_renderbuffer
{
struct gl_renderbuffer Base;
- struct pipe_
textur
e *texture;
+ struct pipe_
resourc
e *texture;
struct pipe_surface *surface; /* temporary view into texture */
struct pipe_surface *surface; /* temporary view into texture */
- enum pipe_format format; /** preferred format, or PIPE_FORMAT_NONE */
GLboolean defined; /**< defined contents? */
GLboolean defined; /**< defined contents? */
+ struct pipe_transfer *transfer; /**< only used when mapping the resource */
+
/**
* Used only when hardware accumulation buffers are not supported.
*/
boolean software;
/**
* Used only when hardware accumulation buffers are not supported.
*/
boolean software;
- size_t stride;
void *data;
void *data;
-
- struct st_texture_object *rtt; /**< GL render to texture's texture */
- int rtt_level, rtt_face, rtt_slice;
- /** Render to texture state */
- struct pipe_texture *texture_save;
- struct pipe_surface *surface_save;
+ /* Inputs from Driver.RenderTexture, don't use directly. */
+ boolean is_rtt; /**< whether Driver.RenderTexture was called */
+ unsigned rtt_face, rtt_slice;
+ boolean rtt_layered; /**< whether glFramebufferTexture was called */
};
};
-static
INLINE
struct st_renderbuffer *
+static
inline
struct st_renderbuffer *
st_renderbuffer(struct gl_renderbuffer *rb)
{
return (struct st_renderbuffer *) rb;
st_renderbuffer(struct gl_renderbuffer *rb)
{
return (struct st_renderbuffer *) rb;
@@
-69,7
+76,10
@@
extern struct gl_renderbuffer *
st_new_renderbuffer_fb(enum pipe_format format, int samples, boolean sw);
extern void
st_new_renderbuffer_fb(enum pipe_format format, int samples, boolean sw);
extern void
-st_init_fbo_functions(struct dd_function_table *functions);
+st_update_renderbuffer_surface(struct st_context *st,
+ struct st_renderbuffer *strb);
+extern void
+st_init_fbo_functions(struct dd_function_table *functions);
#endif /* ST_CB_FBO_H */
#endif /* ST_CB_FBO_H */