projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i965: Clean up brw_prepare_vertices()
[mesa.git]
/
src
/
mesa
/
main
/
feedback.c
diff --git
a/src/mesa/main/feedback.c
b/src/mesa/main/feedback.c
index e20456fa758769525552e716040bcffc7f5a5305..fcb089f1f31eae7049159f7d2457715ec9fd57e9 100644
(file)
--- a/
src/mesa/main/feedback.c
+++ b/
src/mesa/main/feedback.c
@@
-35,6
+35,7
@@
#include "enums.h"
#include "feedback.h"
#include "macros.h"
#include "enums.h"
#include "feedback.h"
#include "macros.h"
+#include "mfeatures.h"
#include "mtypes.h"
#include "main/dispatch.h"
#include "mtypes.h"
#include "main/dispatch.h"
@@
-44,9
+45,8
@@
#define FB_3D 0x01
#define FB_4D 0x02
#define FB_3D 0x01
#define FB_4D 0x02
-#define FB_INDEX 0x04
-#define FB_COLOR 0x08
-#define FB_TEXTURE 0X10
+#define FB_COLOR 0x04
+#define FB_TEXTURE 0X08
@@
-78,18
+78,13
@@
_mesa_FeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer )
ctx->Feedback._Mask = FB_3D;
break;
case GL_3D_COLOR:
ctx->Feedback._Mask = FB_3D;
break;
case GL_3D_COLOR:
- ctx->Feedback._Mask = (FB_3D |
- (ctx->Visual.rgbMode ? FB_COLOR : FB_INDEX));
+ ctx->Feedback._Mask = (FB_3D | FB_COLOR);
break;
case GL_3D_COLOR_TEXTURE:
break;
case GL_3D_COLOR_TEXTURE:
- ctx->Feedback._Mask = (FB_3D |
- (ctx->Visual.rgbMode ? FB_COLOR : FB_INDEX) |
- FB_TEXTURE);
+ ctx->Feedback._Mask = (FB_3D | FB_COLOR | FB_TEXTURE);
break;
case GL_4D_COLOR_TEXTURE:
break;
case GL_4D_COLOR_TEXTURE:
- ctx->Feedback._Mask = (FB_3D | FB_4D |
- (ctx->Visual.rgbMode ? FB_COLOR : FB_INDEX) |
- FB_TEXTURE);
+ ctx->Feedback._Mask = (FB_3D | FB_4D | FB_COLOR | FB_TEXTURE);
break;
default:
_mesa_error( ctx, GL_INVALID_ENUM, "glFeedbackBuffer" );
break;
default:
_mesa_error( ctx, GL_INVALID_ENUM, "glFeedbackBuffer" );
@@
-122,10
+117,9
@@
_mesa_PassThrough( GLfloat token )
* Put a vertex into the feedback buffer.
*/
void
* Put a vertex into the feedback buffer.
*/
void
-_mesa_feedback_vertex(
GL
context *ctx,
+_mesa_feedback_vertex(
struct gl_
context *ctx,
const GLfloat win[4],
const GLfloat color[4],
const GLfloat win[4],
const GLfloat color[4],
- GLfloat index,
const GLfloat texcoord[4])
{
_mesa_feedback_token( ctx, win[0] );
const GLfloat texcoord[4])
{
_mesa_feedback_token( ctx, win[0] );
@@
-136,9
+130,6
@@
_mesa_feedback_vertex(GLcontext *ctx,
if (ctx->Feedback._Mask & FB_4D) {
_mesa_feedback_token( ctx, win[3] );
}
if (ctx->Feedback._Mask & FB_4D) {
_mesa_feedback_token( ctx, win[3] );
}
- if (ctx->Feedback._Mask & FB_INDEX) {
- _mesa_feedback_token( ctx, (GLfloat) index );
- }
if (ctx->Feedback._Mask & FB_COLOR) {
_mesa_feedback_token( ctx, color[0] );
_mesa_feedback_token( ctx, color[1] );
if (ctx->Feedback._Mask & FB_COLOR) {
_mesa_feedback_token( ctx, color[0] );
_mesa_feedback_token( ctx, color[1] );
@@
-169,7
+160,7
@@
_mesa_feedback_vertex(GLcontext *ctx,
* \note this function can't be put in a display list.
*
* Verifies we're not in selection mode, flushes the vertices and initialize
* \note this function can't be put in a display list.
*
* Verifies we're not in selection mode, flushes the vertices and initialize
- * the fields in __
GL
contextRec::Select with the given buffer.
+ * the fields in __
struct gl_
contextRec::Select with the given buffer.
*/
static void GLAPIENTRY
_mesa_SelectBuffer( GLsizei size, GLuint *buffer )
*/
static void GLAPIENTRY
_mesa_SelectBuffer( GLsizei size, GLuint *buffer )
@@
-202,7
+193,7
@@
_mesa_SelectBuffer( GLsizei size, GLuint *buffer )
* increments the pointer.
*/
static INLINE void
* increments the pointer.
*/
static INLINE void
-write_record(
GL
context *ctx, GLuint value)
+write_record(
struct gl_
context *ctx, GLuint value)
{
if (ctx->Select.BufferCount < ctx->Select.BufferSize) {
ctx->Select.Buffer[ctx->Select.BufferCount] = value;
{
if (ctx->Select.BufferCount < ctx->Select.BufferSize) {
ctx->Select.Buffer[ctx->Select.BufferCount] = value;
@@
-221,7
+212,7
@@
write_record(GLcontext *ctx, GLuint value)
* gl_selection::HitMaxZ.
*/
void
* gl_selection::HitMaxZ.
*/
void
-_mesa_update_hitflag(
GL
context *ctx, GLfloat z)
+_mesa_update_hitflag(
struct gl_
context *ctx, GLfloat z)
{
ctx->Select.HitFlag = GL_TRUE;
if (z < ctx->Select.HitMinZ) {
{
ctx->Select.HitFlag = GL_TRUE;
if (z < ctx->Select.HitMinZ) {
@@
-245,7
+236,7
@@
_mesa_update_hitflag(GLcontext *ctx, GLfloat z)
* \sa gl_selection.
*/
static void
* \sa gl_selection.
*/
static void
-write_hit_record(
GL
context *ctx)
+write_hit_record(
struct gl_
context *ctx)
{
GLuint i;
GLuint zmin, zmax, zscale = (~0u);
{
GLuint i;
GLuint zmin, zmax, zscale = (~0u);
@@
-276,7
+267,7
@@
write_hit_record(GLcontext *ctx)
*
* Verifies we are in select mode and resets the name stack depth and resets
* the hit record data in gl_selection. Marks new render mode in
*
* Verifies we are in select mode and resets the name stack depth and resets
* the hit record data in gl_selection. Marks new render mode in
- * __
GL
contextRec::NewState.
+ * __
struct gl_
contextRec::NewState.
*/
static void GLAPIENTRY
_mesa_InitNames( void )
*/
static void GLAPIENTRY
_mesa_InitNames( void )
@@
-307,7
+298,7
@@
_mesa_InitNames( void )
* Flushes vertices. If there is a hit flag writes it (via write_hit_record()),
* and replace the top-most name in the stack.
*
* Flushes vertices. If there is a hit flag writes it (via write_hit_record()),
* and replace the top-most name in the stack.
*
- * sa __
GL
contextRec::Select.
+ * sa __
struct gl_
contextRec::Select.
*/
static void GLAPIENTRY
_mesa_LoadName( GLuint name )
*/
static void GLAPIENTRY
_mesa_LoadName( GLuint name )
@@
-346,7
+337,7
@@
_mesa_LoadName( GLuint name )
* Flushes vertices. If there is a hit flag writes it (via write_hit_record()),
* and adds the name to the top of the name stack.
*
* Flushes vertices. If there is a hit flag writes it (via write_hit_record()),
* and adds the name to the top of the name stack.
*
- * sa __
GL
contextRec::Select.
+ * sa __
struct gl_
contextRec::Select.
*/
static void GLAPIENTRY
_mesa_PushName( GLuint name )
*/
static void GLAPIENTRY
_mesa_PushName( GLuint name )
@@
-377,7
+368,7
@@
_mesa_PushName( GLuint name )
* Flushes vertices. If there is a hit flag writes it (via write_hit_record()),
* and removes top-most name in the name stack.
*
* Flushes vertices. If there is a hit flag writes it (via write_hit_record()),
* and removes top-most name in the name stack.
*
- * sa __
GL
contextRec::Select.
+ * sa __
struct gl_
contextRec::Select.
*/
static void GLAPIENTRY
_mesa_PopName( void )
*/
static void GLAPIENTRY
_mesa_PopName( void )
@@
-419,7
+410,7
@@
_mesa_PopName( void )
* Flushes the vertices and do the necessary cleanup according to the previous
* rasterization mode, such as writing the hit record or resent the select
* buffer index when exiting the select mode. Updates
* Flushes the vertices and do the necessary cleanup according to the previous
* rasterization mode, such as writing the hit record or resent the select
* buffer index when exiting the select mode. Updates
- * __
GL
contextRec::RenderMode and notifies the driver via the
+ * __
struct gl_
contextRec::RenderMode and notifies the driver via the
* dd_function_table::RenderMode callback.
*/
static GLint GLAPIENTRY
* dd_function_table::RenderMode callback.
*/
static GLint GLAPIENTRY
@@
-529,7
+520,7
@@
_mesa_init_feedback_dispatch(struct _glapi_table *disp)
/**
* Initialize context feedback data.
*/
/**
* Initialize context feedback data.
*/
-void _mesa_init_feedback(
GL
context * ctx )
+void _mesa_init_feedback(
struct gl_
context * ctx )
{
/* Feedback */
ctx->Feedback.Type = GL_2D; /* TODO: verify */
{
/* Feedback */
ctx->Feedback.Type = GL_2D; /* TODO: verify */