projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gallium: Fix texture sampling with explicit LOD in softpipe.
[mesa.git]
/
src
/
gallium
/
drivers
/
softpipe
/
sp_state.h
diff --git
a/src/gallium/drivers/softpipe/sp_state.h
b/src/gallium/drivers/softpipe/sp_state.h
index 77ee3c1136bba64015eec2e157d1a70e2ef2aae8..9b18dac67bd0c1a8ac17931f989fe84f9248560c 100644
(file)
--- a/
src/gallium/drivers/softpipe/sp_state.h
+++ b/
src/gallium/drivers/softpipe/sp_state.h
@@
-50,6
+50,7
@@
#define SP_NEW_VERTEX 0x1000
#define SP_NEW_VS 0x2000
#define SP_NEW_QUERY 0x4000
#define SP_NEW_VERTEX 0x1000
#define SP_NEW_VS 0x2000
#define SP_NEW_QUERY 0x4000
+#define SP_NEW_GS 0x8000
struct tgsi_sampler;
struct tgsi_sampler;
@@
-90,6
+91,11
@@
struct sp_vertex_shader {
int max_sampler; /* -1 if no samplers */
};
int max_sampler; /* -1 if no samplers */
};
+/** Subclass of pipe_shader_state */
+struct sp_geometry_shader {
+ struct pipe_shader_state shader;
+ struct draw_geometry_shader *draw_data;
+};
void *
void *
@@
-104,6
+110,10
@@
void *
softpipe_create_sampler_state(struct pipe_context *,
const struct pipe_sampler_state *);
void softpipe_bind_sampler_states(struct pipe_context *, unsigned, void **);
softpipe_create_sampler_state(struct pipe_context *,
const struct pipe_sampler_state *);
void softpipe_bind_sampler_states(struct pipe_context *, unsigned, void **);
+void
+softpipe_bind_vertex_sampler_states(struct pipe_context *,
+ unsigned num_samplers,
+ void **samplers);
void softpipe_delete_sampler_state(struct pipe_context *, void *);
void *
void softpipe_delete_sampler_state(struct pipe_context *, void *);
void *
@@
-139,6
+149,10
@@
void *softpipe_create_vs_state(struct pipe_context *,
const struct pipe_shader_state *);
void softpipe_bind_vs_state(struct pipe_context *, void *);
void softpipe_delete_vs_state(struct pipe_context *, void *);
const struct pipe_shader_state *);
void softpipe_bind_vs_state(struct pipe_context *, void *);
void softpipe_delete_vs_state(struct pipe_context *, void *);
+void *softpipe_create_gs_state(struct pipe_context *,
+ const struct pipe_shader_state *);
+void softpipe_bind_gs_state(struct pipe_context *, void *);
+void softpipe_delete_gs_state(struct pipe_context *, void *);
void softpipe_set_polygon_stipple( struct pipe_context *,
const struct pipe_poly_stipple * );
void softpipe_set_polygon_stipple( struct pipe_context *,
const struct pipe_poly_stipple * );
@@
-150,6
+164,11
@@
void softpipe_set_sampler_textures( struct pipe_context *,
unsigned num,
struct pipe_texture ** );
unsigned num,
struct pipe_texture ** );
+void
+softpipe_set_vertex_sampler_textures(struct pipe_context *,
+ unsigned num_textures,
+ struct pipe_texture **);
+
void softpipe_set_viewport_state( struct pipe_context *,
const struct pipe_viewport_state * );
void softpipe_set_viewport_state( struct pipe_context *,
const struct pipe_viewport_state * );
@@
-165,14
+184,14
@@
void softpipe_set_vertex_buffers(struct pipe_context *,
void softpipe_update_derived( struct softpipe_context *softpipe );
void softpipe_update_derived( struct softpipe_context *softpipe );
-
boolean
softpipe_draw_arrays(struct pipe_context *pipe, unsigned mode,
-
unsigned start, unsigned count);
+
void
softpipe_draw_arrays(struct pipe_context *pipe, unsigned mode,
+ unsigned start, unsigned count);
-
boolean
softpipe_draw_elements(struct pipe_context *pipe,
-
struct pipe_buffer *indexBuffer,
-
unsigned indexSize,
-
unsigned mode, unsigned start, unsigned count);
-boolean
+
void
softpipe_draw_elements(struct pipe_context *pipe,
+ struct pipe_buffer *indexBuffer,
+ unsigned indexSize,
+ unsigned mode, unsigned start, unsigned count);
+void
softpipe_draw_range_elements(struct pipe_context *pipe,
struct pipe_buffer *indexBuffer,
unsigned indexSize,
softpipe_draw_range_elements(struct pipe_context *pipe,
struct pipe_buffer *indexBuffer,
unsigned indexSize,
@@
-180,10
+199,6
@@
softpipe_draw_range_elements(struct pipe_context *pipe,
unsigned max_index,
unsigned mode, unsigned start, unsigned count);
unsigned max_index,
unsigned mode, unsigned start, unsigned count);
-void
-softpipe_set_edgeflags(struct pipe_context *pipe, const unsigned *edgeflags);
-
-
void
softpipe_map_transfers(struct softpipe_context *sp);
void
softpipe_map_transfers(struct softpipe_context *sp);