projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
st/mesa: Set samplers views' first_level.
[mesa.git]
/
src
/
mesa
/
state_tracker
/
st_cb_feedback.c
diff --git
a/src/mesa/state_tracker/st_cb_feedback.c
b/src/mesa/state_tracker/st_cb_feedback.c
index edf26473d455d1bae3087ba2ec20fe5eb901692f..9b85a39beddf62ca0e94d9caf020f48620ce05d4 100644
(file)
--- a/
src/mesa/state_tracker/st_cb_feedback.c
+++ b/
src/mesa/state_tracker/st_cb_feedback.c
@@
-40,6
+40,7
@@
#include "main/imports.h"
#include "main/context.h"
#include "main/feedback.h"
#include "main/imports.h"
#include "main/context.h"
#include "main/feedback.h"
+#include "main/mfeatures.h"
#include "vbo/vbo.h"
#include "vbo/vbo.h"
@@
-54,13
+55,15
@@
#include "draw/draw_pipe.h"
#include "draw/draw_pipe.h"
+#if FEATURE_feedback
+
/**
* This is actually used for both feedback and selection.
*/
struct feedback_stage
{
struct draw_stage stage; /**< Base class */
/**
* This is actually used for both feedback and selection.
*/
struct feedback_stage
{
struct draw_stage stage; /**< Base class */
-
GL
context *ctx; /**< Rendering context */
+
struct gl_
context *ctx; /**< Rendering context */
GLboolean reset_stipple_counter;
};
GLboolean reset_stipple_counter;
};
@@
-77,13
+80,12
@@
feedback_stage( struct draw_stage *stage )
static void
static void
-feedback_vertex(
GL
context *ctx, const struct draw_context *draw,
+feedback_vertex(
struct gl_
context *ctx, const struct draw_context *draw,
const struct vertex_header *v)
{
const struct vertex_header *v)
{
- const struct st_context *st =
ctx->st
;
+ const struct st_context *st =
st_context(ctx)
;
GLfloat win[4];
const GLfloat *color, *texcoord;
GLfloat win[4];
const GLfloat *color, *texcoord;
- const GLfloat ci = 0;
GLuint slot;
/* Recall that Y=0=Top of window for Gallium wincoords */
GLuint slot;
/* Recall that Y=0=Top of window for Gallium wincoords */
@@
-109,7
+111,7
@@
feedback_vertex(GLcontext *ctx, const struct draw_context *draw,
else
texcoord = ctx->Current.Attrib[VERT_ATTRIB_TEX0];
else
texcoord = ctx->Current.Attrib[VERT_ATTRIB_TEX0];
- _mesa_feedback_vertex(ctx, win, color,
ci,
texcoord);
+ _mesa_feedback_vertex(ctx, win, color, texcoord);
}
}
@@
-178,7
+180,7
@@
feedback_destroy( struct draw_stage *stage )
* Create GL feedback drawing stage.
*/
static struct draw_stage *
* Create GL feedback drawing stage.
*/
static struct draw_stage *
-draw_glfeedback_stage(
GL
context *ctx, struct draw_context *draw)
+draw_glfeedback_stage(
struct gl_
context *ctx, struct draw_context *draw)
{
struct feedback_stage *fs = ST_CALLOC_STRUCT(feedback_stage);
{
struct feedback_stage *fs = ST_CALLOC_STRUCT(feedback_stage);
@@
-251,7
+253,7
@@
select_destroy( struct draw_stage *stage )
* Create GL selection mode drawing stage.
*/
static struct draw_stage *
* Create GL selection mode drawing stage.
*/
static struct draw_stage *
-draw_glselect_stage(
GL
context *ctx, struct draw_context *draw)
+draw_glselect_stage(
struct gl_
context *ctx, struct draw_context *draw)
{
struct feedback_stage *fs = ST_CALLOC_STRUCT(feedback_stage);
{
struct feedback_stage *fs = ST_CALLOC_STRUCT(feedback_stage);
@@
-270,9
+272,9
@@
draw_glselect_stage(GLcontext *ctx, struct draw_context *draw)
static void
static void
-st_RenderMode(
GL
context *ctx, GLenum newMode )
+st_RenderMode(
struct gl_
context *ctx, GLenum newMode )
{
{
- struct st_context *st =
ctx->st
;
+ struct st_context *st =
st_context(ctx)
;
struct draw_context *draw = st->draw;
if (newMode == GL_RENDER) {
struct draw_context *draw = st->draw;
if (newMode == GL_RENDER) {
@@
-303,3
+305,5
@@
void st_init_feedback_functions(struct dd_function_table *functions)
{
functions->RenderMode = st_RenderMode;
}
{
functions->RenderMode = st_RenderMode;
}
+
+#endif /* FEATURE_feedback */