summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorBrian <[email protected]>2008-02-27 18:49:35 -0700
committerBrian <[email protected]>2008-02-27 18:49:35 -0700
commitd8bf051c8b4a1ebe44895413a109d4ab898f7579 (patch)
treec1036cb99455c0ad8f883d46518059d93ca8818b /src/gallium
parent1774b177b858f9f87d00e54b0bf00e9634e375e9 (diff)
gallium: remove unneeded pipe ptr from pipe_texture
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/include/pipe/p_state.h10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h
index bb4a6cb23ed..5fab41acbd4 100644
--- a/src/gallium/include/pipe/p_state.h
+++ b/src/gallium/include/pipe/p_state.h
@@ -161,6 +161,7 @@ struct pipe_constant_buffer
struct pipe_shader_state
{
const struct tgsi_token *tokens;
+ /* XXX these are going away */
ubyte num_inputs;
ubyte num_outputs;
ubyte input_semantic_name[PIPE_MAX_SHADER_INPUTS]; /**< TGSI_SEMANTIC_x */
@@ -276,8 +277,7 @@ struct pipe_surface
/**
- * Texture. Represents one or several texture images on one or several mipmap
- * levels.
+ * Texture object.
*/
struct pipe_texture
{
@@ -298,11 +298,7 @@ struct pipe_texture
*/
unsigned refcount;
- /**< pipe that created the texture
- * XXX this'll change to a pipe_winsys (or pipe_screen)...
- */
- struct pipe_context *pipe;
- struct pipe_screen *screen;
+ struct pipe_screen *screen; /**< screen that this texture belongs to */
};