diff options
Diffstat (limited to 'src/gallium/drivers/i915/i915_context.h')
| -rw-r--r-- | src/gallium/drivers/i915/i915_context.h | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/gallium/drivers/i915/i915_context.h b/src/gallium/drivers/i915/i915_context.h index d3ea29d1b41..be2c65d21ca 100644 --- a/src/gallium/drivers/i915/i915_context.h +++ b/src/gallium/drivers/i915/i915_context.h @@ -36,6 +36,7 @@ #include "tgsi/tgsi_scan.h" +#include "util/log.h" #include "util/slab.h" #include "util/u_blitter.h" #include "i915_reg.h" @@ -119,7 +120,7 @@ struct i915_fragment_shader { * slot of the user's constant buffer. (set by pipe->set_constant_buffer()) * Else, the bitmask indicates which components are occupied by immediates. */ - ubyte constant_flags[I915_MAX_CONSTANT]; + uint8_t constant_flags[I915_MAX_CONSTANT]; /** * The mapping between TGSI inputs and hw texture coords. @@ -131,6 +132,12 @@ struct i915_fragment_shader { } texcoords[I915_TEX_UNITS]; bool reads_pntc; + + /* Set if the shader is an internal (blit, etc.) shader that shouldn't debug + * log by default. */ + bool internal; + + char *error; /* Any error message from compiling this shader (or NULL) */ }; struct i915_cache_context; @@ -154,7 +161,10 @@ struct i915_state { unsigned texbuffer[I915_TEX_UNITS][3]; /** Describes the current hardware vertex layout */ - struct vertex_info vertex_info; + struct i915_vertex_info { + struct vertex_info draw; /** vertex_info from draw_module */ + uint32_t hwfmt[4]; /** Hardware format info */ + } vertex_info; /* static state (dst/depth buffer state) */ struct i915_winsys_buffer *cbuf_bo; @@ -309,7 +319,7 @@ struct i915_context { /** blitter/hw-clear */ struct blitter_context *blitter; - struct pipe_debug_callback debug; + struct util_debug_callback debug; }; /* A flag for each frontend state object: |