projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove APIspec.dtd
[mesa.git]
/
src
/
mesa
/
swrast
/
s_feedback.c
diff --git
a/src/mesa/swrast/s_feedback.c
b/src/mesa/swrast/s_feedback.c
index 7bb914b6589667c7c2307fb1a0445876fb339f5c..00f92d463c33f1626313b4d47d94e56dd4c7af98 100644
(file)
--- a/
src/mesa/swrast/s_feedback.c
+++ b/
src/mesa/swrast/s_feedback.c
@@
-24,8
+24,6
@@
#include "main/glheader.h"
#include "main/colormac.h"
#include "main/glheader.h"
#include "main/colormac.h"
-#include "main/context.h"
-#include "main/enums.h"
#include "main/feedback.h"
#include "main/macros.h"
#include "main/feedback.h"
#include "main/macros.h"
@@
-36,7
+34,7
@@
static void
static void
-feedback_vertex(
GL
context * ctx, const SWvertex * v, const SWvertex * pv)
+feedback_vertex(
struct gl_
context * ctx, const SWvertex * v, const SWvertex * pv)
{
GLfloat win[4];
const GLfloat *vtc = v->attrib[FRAG_ATTRIB_TEX0];
{
GLfloat win[4];
const GLfloat *vtc = v->attrib[FRAG_ATTRIB_TEX0];
@@
-47,7
+45,7
@@
feedback_vertex(GLcontext * ctx, const SWvertex * v, const SWvertex * pv)
win[2] = v->attrib[FRAG_ATTRIB_WPOS][2] / ctx->DrawBuffer->_DepthMaxF;
win[3] = 1.0F / v->attrib[FRAG_ATTRIB_WPOS][3];
win[2] = v->attrib[FRAG_ATTRIB_WPOS][2] / ctx->DrawBuffer->_DepthMaxF;
win[3] = 1.0F / v->attrib[FRAG_ATTRIB_WPOS][3];
- _mesa_feedback_vertex(ctx, win, color, v
->attrib[FRAG_ATTRIB_CI][0], v
tc);
+ _mesa_feedback_vertex(ctx, win, color, vtc);
}
}
@@
-55,10
+53,10
@@
feedback_vertex(GLcontext * ctx, const SWvertex * v, const SWvertex * pv)
* Put triangle in feedback buffer.
*/
void
* Put triangle in feedback buffer.
*/
void
-_swrast_feedback_triangle(
GL
context *ctx, const SWvertex *v0,
+_swrast_feedback_triangle(
struct gl_
context *ctx, const SWvertex *v0,
const SWvertex *v1, const SWvertex *v2)
{
const SWvertex *v1, const SWvertex *v2)
{
- if (_swrast_culltriangle(ctx, v0, v1, v2)) {
+ if (
!
_swrast_culltriangle(ctx, v0, v1, v2)) {
_mesa_feedback_token(ctx, (GLfloat) (GLint) GL_POLYGON_TOKEN);
_mesa_feedback_token(ctx, (GLfloat) 3); /* three vertices */
_mesa_feedback_token(ctx, (GLfloat) (GLint) GL_POLYGON_TOKEN);
_mesa_feedback_token(ctx, (GLfloat) 3); /* three vertices */
@@
-77,7
+75,7
@@
_swrast_feedback_triangle(GLcontext *ctx, const SWvertex *v0,
void
void
-_swrast_feedback_line(
GL
context *ctx, const SWvertex *v0,
+_swrast_feedback_line(
struct gl_
context *ctx, const SWvertex *v0,
const SWvertex *v1)
{
GLenum token = GL_LINE_TOKEN;
const SWvertex *v1)
{
GLenum token = GL_LINE_TOKEN;
@@
-102,7
+100,7
@@
_swrast_feedback_line(GLcontext *ctx, const SWvertex *v0,
void
void
-_swrast_feedback_point(
GL
context *ctx, const SWvertex *v)
+_swrast_feedback_point(
struct gl_
context *ctx, const SWvertex *v)
{
_mesa_feedback_token(ctx, (GLfloat) (GLint) GL_POINT_TOKEN);
feedback_vertex(ctx, v, v);
{
_mesa_feedback_token(ctx, (GLfloat) (GLint) GL_POINT_TOKEN);
feedback_vertex(ctx, v, v);
@@
-110,10
+108,10
@@
_swrast_feedback_point(GLcontext *ctx, const SWvertex *v)
void
void
-_swrast_select_triangle(
GL
context *ctx, const SWvertex *v0,
+_swrast_select_triangle(
struct gl_
context *ctx, const SWvertex *v0,
const SWvertex *v1, const SWvertex *v2)
{
const SWvertex *v1, const SWvertex *v2)
{
- if (_swrast_culltriangle(ctx, v0, v1, v2)) {
+ if (
!
_swrast_culltriangle(ctx, v0, v1, v2)) {
const GLfloat zs = 1.0F / ctx->DrawBuffer->_DepthMaxF;
_mesa_update_hitflag( ctx, v0->attrib[FRAG_ATTRIB_WPOS][2] * zs );
const GLfloat zs = 1.0F / ctx->DrawBuffer->_DepthMaxF;
_mesa_update_hitflag( ctx, v0->attrib[FRAG_ATTRIB_WPOS][2] * zs );
@@
-124,7
+122,7
@@
_swrast_select_triangle(GLcontext *ctx, const SWvertex *v0,
void
void
-_swrast_select_line(
GL
context *ctx, const SWvertex *v0, const SWvertex *v1)
+_swrast_select_line(
struct gl_
context *ctx, const SWvertex *v0, const SWvertex *v1)
{
const GLfloat zs = 1.0F / ctx->DrawBuffer->_DepthMaxF;
_mesa_update_hitflag( ctx, v0->attrib[FRAG_ATTRIB_WPOS][2] * zs );
{
const GLfloat zs = 1.0F / ctx->DrawBuffer->_DepthMaxF;
_mesa_update_hitflag( ctx, v0->attrib[FRAG_ATTRIB_WPOS][2] * zs );
@@
-133,7
+131,7
@@
_swrast_select_line(GLcontext *ctx, const SWvertex *v0, const SWvertex *v1)
void
void
-_swrast_select_point(
GL
context *ctx, const SWvertex *v)
+_swrast_select_point(
struct gl_
context *ctx, const SWvertex *v)
{
const GLfloat zs = 1.0F / ctx->DrawBuffer->_DepthMaxF;
_mesa_update_hitflag( ctx, v->attrib[FRAG_ATTRIB_WPOS][2] * zs );
{
const GLfloat zs = 1.0F / ctx->DrawBuffer->_DepthMaxF;
_mesa_update_hitflag( ctx, v->attrib[FRAG_ATTRIB_WPOS][2] * zs );