mirror of
https://github.com/reactos/reactos.git
synced 2024-10-05 00:43:21 +00:00
[OPENGL32/MESA]
- Some more cleanup from previous commits CORE-7499 svn path=/trunk/; revision=63609
This commit is contained in:
parent
07b02cbbe9
commit
55f8bd0cd2
|
@ -36,7 +36,6 @@
|
|||
#include "main/texobj.h"
|
||||
#include "main/texstore.h"
|
||||
#include "main/bufferobj.h"
|
||||
#include "main/texturebarrier.h"
|
||||
|
||||
#include "tnl/tnl.h"
|
||||
#include "swrast/swrast.h"
|
||||
|
@ -144,8 +143,6 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
|
|||
driver->MapRenderbuffer = _swrast_map_soft_renderbuffer;
|
||||
driver->UnmapRenderbuffer = _swrast_unmap_soft_renderbuffer;
|
||||
|
||||
_mesa_init_texture_barrier_functions(driver);
|
||||
|
||||
/* T&L stuff */
|
||||
driver->CurrentExecPrimitive = 0;
|
||||
driver->CurrentSavePrimitive = 0;
|
||||
|
|
|
@ -166,10 +166,8 @@ struct clear_state
|
|||
{
|
||||
GLuint ArrayObj;
|
||||
GLuint VBO;
|
||||
GLuint ShaderProg;
|
||||
GLint ColorLocation;
|
||||
|
||||
GLuint IntegerShaderProg;
|
||||
GLint IntegerColorLocation;
|
||||
};
|
||||
|
||||
|
|
|
@ -34,7 +34,6 @@ list(APPEND SOURCE
|
|||
getstring.c
|
||||
hash.c
|
||||
hint.c
|
||||
#histogram.c
|
||||
image.c
|
||||
imports.c
|
||||
light.c
|
||||
|
@ -66,7 +65,6 @@ list(APPEND SOURCE
|
|||
texstate.c
|
||||
texstorage.c
|
||||
texstore.c
|
||||
texturebarrier.c
|
||||
varray.c
|
||||
version.c
|
||||
viewport.c
|
||||
|
|
|
@ -30,8 +30,6 @@
|
|||
|
||||
#include <precomp.h>
|
||||
|
||||
#include "histogram.h"
|
||||
|
||||
#if FEATURE_GL
|
||||
|
||||
|
||||
|
@ -215,7 +213,6 @@ _mesa_create_exec_table(void)
|
|||
|
||||
_mesa_init_colortable_dispatch(exec);
|
||||
_mesa_init_convolve_dispatch(exec);
|
||||
_mesa_init_histogram_dispatch(exec);
|
||||
|
||||
/* 2. GL_EXT_blend_color */
|
||||
#if 0
|
||||
|
@ -227,16 +224,6 @@ _mesa_create_exec_table(void)
|
|||
SET_PolygonOffsetEXT(exec, _mesa_PolygonOffsetEXT);
|
||||
#endif
|
||||
|
||||
/* 11. GL_EXT_histogram */
|
||||
#if 0
|
||||
SET_GetHistogramEXT(exec, _mesa_GetHistogram);
|
||||
SET_GetHistogramParameterfvEXT(exec, _mesa_GetHistogramParameterfv);
|
||||
SET_GetHistogramParameterivEXT(exec, _mesa_GetHistogramParameteriv);
|
||||
SET_GetMinmaxEXT(exec, _mesa_GetMinmax);
|
||||
SET_GetMinmaxParameterfvEXT(exec, _mesa_GetMinmaxParameterfv);
|
||||
SET_GetMinmaxParameterivEXT(exec, _mesa_GetMinmaxParameteriv);
|
||||
#endif
|
||||
|
||||
/* 14. SGI_color_table */
|
||||
#if 0
|
||||
SET_ColorTableSGI(exec, _mesa_ColorTable);
|
||||
|
@ -287,37 +274,6 @@ _mesa_create_exec_table(void)
|
|||
SET_MultiModeDrawElementsIBM(exec, _mesa_MultiModeDrawElementsIBM);
|
||||
#endif
|
||||
|
||||
/* 233. GL_NV_vertex_program */
|
||||
#if FEATURE_NV_vertex_program
|
||||
SET_ExecuteProgramNV(exec, _mesa_ExecuteProgramNV);
|
||||
SET_GenProgramsNV(exec, _mesa_GenPrograms);
|
||||
SET_AreProgramsResidentNV(exec, _mesa_AreProgramsResidentNV);
|
||||
SET_RequestResidentProgramsNV(exec, _mesa_RequestResidentProgramsNV);
|
||||
SET_GetProgramParameterfvNV(exec, _mesa_GetProgramParameterfvNV);
|
||||
SET_GetProgramParameterdvNV(exec, _mesa_GetProgramParameterdvNV);
|
||||
SET_GetProgramivNV(exec, _mesa_GetProgramivNV);
|
||||
SET_GetTrackMatrixivNV(exec, _mesa_GetTrackMatrixivNV);
|
||||
SET_LoadProgramNV(exec, _mesa_LoadProgramNV);
|
||||
SET_ProgramEnvParameter4dARB(exec, _mesa_ProgramEnvParameter4dARB); /* alias to ProgramParameter4dNV */
|
||||
SET_ProgramEnvParameter4dvARB(exec, _mesa_ProgramEnvParameter4dvARB); /* alias to ProgramParameter4dvNV */
|
||||
SET_ProgramEnvParameter4fARB(exec, _mesa_ProgramEnvParameter4fARB); /* alias to ProgramParameter4fNV */
|
||||
SET_ProgramEnvParameter4fvARB(exec, _mesa_ProgramEnvParameter4fvARB); /* alias to ProgramParameter4fvNV */
|
||||
SET_ProgramParameters4dvNV(exec, _mesa_ProgramParameters4dvNV);
|
||||
SET_ProgramParameters4fvNV(exec, _mesa_ProgramParameters4fvNV);
|
||||
SET_TrackMatrixNV(exec, _mesa_TrackMatrixNV);
|
||||
/* glVertexAttrib*NV functions handled in api_loopback.c */
|
||||
#endif
|
||||
|
||||
/* 282. GL_NV_fragment_program */
|
||||
#if FEATURE_NV_fragment_program
|
||||
SET_ProgramNamedParameter4fNV(exec, _mesa_ProgramNamedParameter4fNV);
|
||||
SET_ProgramNamedParameter4dNV(exec, _mesa_ProgramNamedParameter4dNV);
|
||||
SET_ProgramNamedParameter4fvNV(exec, _mesa_ProgramNamedParameter4fvNV);
|
||||
SET_ProgramNamedParameter4dvNV(exec, _mesa_ProgramNamedParameter4dvNV);
|
||||
SET_GetProgramNamedParameterfvNV(exec, _mesa_GetProgramNamedParameterfvNV);
|
||||
SET_GetProgramNamedParameterdvNV(exec, _mesa_GetProgramNamedParameterdvNV);
|
||||
#endif
|
||||
|
||||
/* 262. GL_NV_point_sprite */
|
||||
#if _HAVE_FULL_GL
|
||||
SET_PointParameteriNV(exec, _mesa_PointParameteri);
|
||||
|
@ -372,9 +328,6 @@ _mesa_create_exec_table(void)
|
|||
/* GL 3.0 (functions not covered by other extensions) */
|
||||
SET_GetStringi(exec, _mesa_GetStringi);
|
||||
|
||||
/* GL_NV_texture_barrier */
|
||||
SET_TextureBarrierNV(exec, _mesa_TextureBarrierNV);
|
||||
|
||||
/* GL_ARB_texture_storage */
|
||||
SET_TexStorage1D(exec, _mesa_TexStorage1D);
|
||||
SET_TexStorage2D(exec, _mesa_TexStorage2D);
|
||||
|
|
|
@ -991,113 +991,6 @@ loopback_VertexAttrib4ubvNV(GLuint index, const GLubyte *v)
|
|||
}
|
||||
|
||||
|
||||
static void GLAPIENTRY
|
||||
loopback_VertexAttribs1svNV(GLuint index, GLsizei n, const GLshort *v)
|
||||
{
|
||||
GLint i;
|
||||
for (i = n - 1; i >= 0; i--)
|
||||
loopback_VertexAttrib1svNV(index + i, v + i);
|
||||
}
|
||||
|
||||
static void GLAPIENTRY
|
||||
loopback_VertexAttribs1fvNV(GLuint index, GLsizei n, const GLfloat *v)
|
||||
{
|
||||
GLint i;
|
||||
for (i = n - 1; i >= 0; i--)
|
||||
ATTRIB1NV(index + i, v[i]);
|
||||
}
|
||||
|
||||
static void GLAPIENTRY
|
||||
loopback_VertexAttribs1dvNV(GLuint index, GLsizei n, const GLdouble *v)
|
||||
{
|
||||
GLint i;
|
||||
for (i = n - 1; i >= 0; i--)
|
||||
loopback_VertexAttrib1dvNV(index + i, v + i);
|
||||
}
|
||||
|
||||
static void GLAPIENTRY
|
||||
loopback_VertexAttribs2svNV(GLuint index, GLsizei n, const GLshort *v)
|
||||
{
|
||||
GLint i;
|
||||
for (i = n - 1; i >= 0; i--)
|
||||
loopback_VertexAttrib2svNV(index + i, v + 2 * i);
|
||||
}
|
||||
|
||||
static void GLAPIENTRY
|
||||
loopback_VertexAttribs2fvNV(GLuint index, GLsizei n, const GLfloat *v)
|
||||
{
|
||||
GLint i;
|
||||
for (i = n - 1; i >= 0; i--)
|
||||
ATTRIB2NV(index + i, v[2 * i], v[2 * i + 1]);
|
||||
}
|
||||
|
||||
static void GLAPIENTRY
|
||||
loopback_VertexAttribs2dvNV(GLuint index, GLsizei n, const GLdouble *v)
|
||||
{
|
||||
GLint i;
|
||||
for (i = n - 1; i >= 0; i--)
|
||||
loopback_VertexAttrib2dvNV(index + i, v + 2 * i);
|
||||
}
|
||||
|
||||
static void GLAPIENTRY
|
||||
loopback_VertexAttribs3svNV(GLuint index, GLsizei n, const GLshort *v)
|
||||
{
|
||||
GLint i;
|
||||
for (i = n - 1; i >= 0; i--)
|
||||
loopback_VertexAttrib3svNV(index + i, v + 3 * i);
|
||||
}
|
||||
|
||||
static void GLAPIENTRY
|
||||
loopback_VertexAttribs3fvNV(GLuint index, GLsizei n, const GLfloat *v)
|
||||
{
|
||||
GLint i;
|
||||
for (i = n - 1; i >= 0; i--)
|
||||
ATTRIB3NV(index + i, v[3 * i], v[3 * i + 1], v[3 * i + 2]);
|
||||
}
|
||||
|
||||
static void GLAPIENTRY
|
||||
loopback_VertexAttribs3dvNV(GLuint index, GLsizei n, const GLdouble *v)
|
||||
{
|
||||
GLint i;
|
||||
for (i = n - 1; i >= 0; i--)
|
||||
loopback_VertexAttrib3dvNV(index + i, v + 3 * i);
|
||||
}
|
||||
|
||||
static void GLAPIENTRY
|
||||
loopback_VertexAttribs4svNV(GLuint index, GLsizei n, const GLshort *v)
|
||||
{
|
||||
GLint i;
|
||||
for (i = n - 1; i >= 0; i--)
|
||||
loopback_VertexAttrib4svNV(index + i, v + 4 * i);
|
||||
}
|
||||
|
||||
static void GLAPIENTRY
|
||||
loopback_VertexAttribs4fvNV(GLuint index, GLsizei n, const GLfloat *v)
|
||||
{
|
||||
GLint i;
|
||||
for (i = n - 1; i >= 0; i--)
|
||||
ATTRIB4NV(index + i, v[4 * i], v[4 * i + 1], v[4 * i + 2], v[4 * i + 3]);
|
||||
}
|
||||
|
||||
static void GLAPIENTRY
|
||||
loopback_VertexAttribs4dvNV(GLuint index, GLsizei n, const GLdouble *v)
|
||||
{
|
||||
GLint i;
|
||||
for (i = n - 1; i >= 0; i--)
|
||||
loopback_VertexAttrib4dvNV(index + i, v + 4 * i);
|
||||
}
|
||||
|
||||
static void GLAPIENTRY
|
||||
loopback_VertexAttribs4ubvNV(GLuint index, GLsizei n, const GLubyte *v)
|
||||
{
|
||||
GLint i;
|
||||
for (i = n - 1; i >= 0; i--)
|
||||
loopback_VertexAttrib4ubvNV(index + i, v + 4 * i);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* This code never registers handlers for any of the entry points
|
||||
* listed in vtxfmt.h.
|
||||
|
@ -1246,19 +1139,6 @@ _mesa_loopback_init_api_table( struct _glapi_table *dest )
|
|||
SET_VertexAttrib4svNV(dest, loopback_VertexAttrib4svNV);
|
||||
SET_VertexAttrib4dvNV(dest, loopback_VertexAttrib4dvNV);
|
||||
SET_VertexAttrib4ubvNV(dest, loopback_VertexAttrib4ubvNV);
|
||||
SET_VertexAttribs1svNV(dest, loopback_VertexAttribs1svNV);
|
||||
SET_VertexAttribs1fvNV(dest, loopback_VertexAttribs1fvNV);
|
||||
SET_VertexAttribs1dvNV(dest, loopback_VertexAttribs1dvNV);
|
||||
SET_VertexAttribs2svNV(dest, loopback_VertexAttribs2svNV);
|
||||
SET_VertexAttribs2fvNV(dest, loopback_VertexAttribs2fvNV);
|
||||
SET_VertexAttribs2dvNV(dest, loopback_VertexAttribs2dvNV);
|
||||
SET_VertexAttribs3svNV(dest, loopback_VertexAttribs3svNV);
|
||||
SET_VertexAttribs3fvNV(dest, loopback_VertexAttribs3fvNV);
|
||||
SET_VertexAttribs3dvNV(dest, loopback_VertexAttribs3dvNV);
|
||||
SET_VertexAttribs4svNV(dest, loopback_VertexAttribs4svNV);
|
||||
SET_VertexAttribs4fvNV(dest, loopback_VertexAttribs4fvNV);
|
||||
SET_VertexAttribs4dvNV(dest, loopback_VertexAttribs4dvNV);
|
||||
SET_VertexAttribs4ubvNV(dest, loopback_VertexAttribs4ubvNV);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -666,11 +666,6 @@ struct dd_function_table {
|
|||
void (*EndCallList)( struct gl_context *ctx );
|
||||
|
||||
/**@}*/
|
||||
|
||||
/**
|
||||
* \name GL_NV_texture_barrier interface
|
||||
*/
|
||||
void (*TextureBarrier)(struct gl_context *ctx);
|
||||
};
|
||||
|
||||
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -193,7 +193,6 @@ typedef enum
|
|||
OPCODE_FRONT_FACE,
|
||||
OPCODE_FRUSTUM,
|
||||
OPCODE_HINT,
|
||||
OPCODE_HISTOGRAM,
|
||||
OPCODE_INDEX_MASK,
|
||||
OPCODE_INIT_NAMES,
|
||||
OPCODE_LIGHT,
|
||||
|
@ -210,7 +209,6 @@ typedef enum
|
|||
OPCODE_MAPGRID1,
|
||||
OPCODE_MAPGRID2,
|
||||
OPCODE_MATRIX_MODE,
|
||||
OPCODE_MIN_MAX,
|
||||
OPCODE_MULT_MATRIX,
|
||||
OPCODE_ORTHO,
|
||||
OPCODE_PASSTHROUGH,
|
||||
|
@ -231,8 +229,6 @@ typedef enum
|
|||
OPCODE_PUSH_NAME,
|
||||
OPCODE_RASTER_POS,
|
||||
OPCODE_READ_BUFFER,
|
||||
OPCODE_RESET_HISTOGRAM,
|
||||
OPCODE_RESET_MIN_MAX,
|
||||
OPCODE_ROTATE,
|
||||
OPCODE_SCALE,
|
||||
OPCODE_SCISSOR,
|
||||
|
@ -281,9 +277,6 @@ typedef enum
|
|||
OPCODE_TEXPARAMETER_I,
|
||||
OPCODE_TEXPARAMETER_UI,
|
||||
|
||||
/* GL_NV_texture_barrier */
|
||||
OPCODE_TEXTURE_BARRIER_NV,
|
||||
|
||||
/* The following three are meta instructions */
|
||||
OPCODE_ERROR, /* raise compiled-in error */
|
||||
OPCODE_CONTINUE,
|
||||
|
@ -1899,27 +1892,6 @@ save_Hint(GLenum target, GLenum mode)
|
|||
}
|
||||
|
||||
|
||||
static void GLAPIENTRY
|
||||
save_Histogram(GLenum target, GLsizei width, GLenum internalFormat,
|
||||
GLboolean sink)
|
||||
{
|
||||
GET_CURRENT_CONTEXT(ctx);
|
||||
Node *n;
|
||||
|
||||
ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
|
||||
n = alloc_instruction(ctx, OPCODE_HISTOGRAM, 4);
|
||||
if (n) {
|
||||
n[1].e = target;
|
||||
n[2].i = width;
|
||||
n[3].e = internalFormat;
|
||||
n[4].b = sink;
|
||||
}
|
||||
if (ctx->ExecuteFlag) {
|
||||
CALL_Histogram(ctx->Exec, (target, width, internalFormat, sink));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static void GLAPIENTRY
|
||||
save_IndexMask(GLuint mask)
|
||||
{
|
||||
|
@ -2436,25 +2408,6 @@ save_MatrixMode(GLenum mode)
|
|||
}
|
||||
|
||||
|
||||
static void GLAPIENTRY
|
||||
save_Minmax(GLenum target, GLenum internalFormat, GLboolean sink)
|
||||
{
|
||||
GET_CURRENT_CONTEXT(ctx);
|
||||
Node *n;
|
||||
|
||||
ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
|
||||
n = alloc_instruction(ctx, OPCODE_MIN_MAX, 3);
|
||||
if (n) {
|
||||
n[1].e = target;
|
||||
n[2].e = internalFormat;
|
||||
n[3].b = sink;
|
||||
}
|
||||
if (ctx->ExecuteFlag) {
|
||||
CALL_Minmax(ctx->Exec, (target, internalFormat, sink));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static void GLAPIENTRY
|
||||
save_MultMatrixf(const GLfloat * m)
|
||||
{
|
||||
|
@ -3036,38 +2989,6 @@ save_ReadBuffer(GLenum mode)
|
|||
}
|
||||
|
||||
|
||||
static void GLAPIENTRY
|
||||
save_ResetHistogram(GLenum target)
|
||||
{
|
||||
GET_CURRENT_CONTEXT(ctx);
|
||||
Node *n;
|
||||
ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
|
||||
n = alloc_instruction(ctx, OPCODE_RESET_HISTOGRAM, 1);
|
||||
if (n) {
|
||||
n[1].e = target;
|
||||
}
|
||||
if (ctx->ExecuteFlag) {
|
||||
CALL_ResetHistogram(ctx->Exec, (target));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static void GLAPIENTRY
|
||||
save_ResetMinmax(GLenum target)
|
||||
{
|
||||
GET_CURRENT_CONTEXT(ctx);
|
||||
Node *n;
|
||||
ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
|
||||
n = alloc_instruction(ctx, OPCODE_RESET_MIN_MAX, 1);
|
||||
if (n) {
|
||||
n[1].e = target;
|
||||
}
|
||||
if (ctx->ExecuteFlag) {
|
||||
CALL_ResetMinmax(ctx->Exec, (target));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static void GLAPIENTRY
|
||||
save_Rotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z)
|
||||
{
|
||||
|
@ -3799,69 +3720,6 @@ save_SampleCoverageARB(GLclampf value, GLboolean invert)
|
|||
}
|
||||
|
||||
|
||||
/*
|
||||
* GL_NV_vertex_program
|
||||
*/
|
||||
|
||||
#if FEATURE_NV_fragment_program
|
||||
static void GLAPIENTRY
|
||||
save_ProgramNamedParameter4fNV(GLuint id, GLsizei len, const GLubyte * name,
|
||||
GLfloat x, GLfloat y, GLfloat z, GLfloat w)
|
||||
{
|
||||
GET_CURRENT_CONTEXT(ctx);
|
||||
Node *n;
|
||||
|
||||
ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
|
||||
|
||||
n = alloc_instruction(ctx, OPCODE_PROGRAM_NAMED_PARAMETER_NV, 6);
|
||||
if (n) {
|
||||
GLubyte *nameCopy = (GLubyte *) malloc(len);
|
||||
if (!nameCopy) {
|
||||
_mesa_error(ctx, GL_OUT_OF_MEMORY, "glProgramNamedParameter4fNV");
|
||||
return;
|
||||
}
|
||||
memcpy(nameCopy, name, len);
|
||||
n[1].ui = id;
|
||||
n[2].i = len;
|
||||
n[3].data = nameCopy;
|
||||
n[4].f = x;
|
||||
n[5].f = y;
|
||||
n[6].f = z;
|
||||
n[7].f = w;
|
||||
}
|
||||
if (ctx->ExecuteFlag) {
|
||||
CALL_ProgramNamedParameter4fNV(ctx->Exec, (id, len, name, x, y, z, w));
|
||||
}
|
||||
}
|
||||
|
||||
static void GLAPIENTRY
|
||||
save_ProgramNamedParameter4fvNV(GLuint id, GLsizei len, const GLubyte * name,
|
||||
const float v[])
|
||||
{
|
||||
save_ProgramNamedParameter4fNV(id, len, name, v[0], v[1], v[2], v[3]);
|
||||
}
|
||||
|
||||
|
||||
static void GLAPIENTRY
|
||||
save_ProgramNamedParameter4dNV(GLuint id, GLsizei len, const GLubyte * name,
|
||||
GLdouble x, GLdouble y, GLdouble z, GLdouble w)
|
||||
{
|
||||
save_ProgramNamedParameter4fNV(id, len, name, (GLfloat) x, (GLfloat) y,
|
||||
(GLfloat) z, (GLfloat) w);
|
||||
}
|
||||
|
||||
|
||||
static void GLAPIENTRY
|
||||
save_ProgramNamedParameter4dvNV(GLuint id, GLsizei len, const GLubyte * name,
|
||||
const double v[])
|
||||
{
|
||||
save_ProgramNamedParameter4fNV(id, len, name, (GLfloat) v[0],
|
||||
(GLfloat) v[1], (GLfloat) v[2],
|
||||
(GLfloat) v[3]);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
/* GL_EXT_depth_bounds_test */
|
||||
static void GLAPIENTRY
|
||||
save_DepthBoundsEXT(GLclampd zmin, GLclampd zmax)
|
||||
|
@ -4555,19 +4413,6 @@ exec_GetTexParameterIuiv(GLenum target, GLenum pname, GLuint *params)
|
|||
CALL_GetTexParameterIuivEXT(ctx->Exec, (target, pname, params));
|
||||
}
|
||||
|
||||
|
||||
/* GL_NV_texture_barrier */
|
||||
static void GLAPIENTRY
|
||||
save_TextureBarrierNV(void)
|
||||
{
|
||||
GET_CURRENT_CONTEXT(ctx);
|
||||
ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
|
||||
alloc_instruction(ctx, OPCODE_TEXTURE_BARRIER_NV, 0);
|
||||
if (ctx->ExecuteFlag) {
|
||||
CALL_TextureBarrierNV(ctx->Exec, ());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Save an error-generating command into display list.
|
||||
*
|
||||
|
@ -4924,9 +4769,6 @@ execute_list(struct gl_context *ctx, GLuint list)
|
|||
case OPCODE_HINT:
|
||||
CALL_Hint(ctx->Exec, (n[1].e, n[2].e));
|
||||
break;
|
||||
case OPCODE_HISTOGRAM:
|
||||
CALL_Histogram(ctx->Exec, (n[1].e, n[2].i, n[3].e, n[4].b));
|
||||
break;
|
||||
case OPCODE_INDEX_MASK:
|
||||
CALL_IndexMask(ctx->Exec, (n[1].ui));
|
||||
break;
|
||||
|
@ -5021,9 +4863,6 @@ execute_list(struct gl_context *ctx, GLuint list)
|
|||
case OPCODE_MATRIX_MODE:
|
||||
CALL_MatrixMode(ctx->Exec, (n[1].e));
|
||||
break;
|
||||
case OPCODE_MIN_MAX:
|
||||
CALL_Minmax(ctx->Exec, (n[1].e, n[2].e, n[3].b));
|
||||
break;
|
||||
case OPCODE_MULT_MATRIX:
|
||||
if (sizeof(Node) == sizeof(GLfloat)) {
|
||||
CALL_MultMatrixf(ctx->Exec, (&n[1].f));
|
||||
|
@ -5107,12 +4946,6 @@ execute_list(struct gl_context *ctx, GLuint list)
|
|||
case OPCODE_READ_BUFFER:
|
||||
CALL_ReadBuffer(ctx->Exec, (n[1].e));
|
||||
break;
|
||||
case OPCODE_RESET_HISTOGRAM:
|
||||
CALL_ResetHistogram(ctx->Exec, (n[1].e));
|
||||
break;
|
||||
case OPCODE_RESET_MIN_MAX:
|
||||
CALL_ResetMinmax(ctx->Exec, (n[1].e));
|
||||
break;
|
||||
case OPCODE_ROTATE:
|
||||
CALL_Rotatef(ctx->Exec, (n[1].f, n[2].f, n[3].f, n[4].f));
|
||||
break;
|
||||
|
@ -5232,38 +5065,6 @@ execute_list(struct gl_context *ctx, GLuint list)
|
|||
case OPCODE_WINDOW_POS_ARB: /* GL_ARB_window_pos */
|
||||
CALL_WindowPos3fMESA(ctx->Exec, (n[1].f, n[2].f, n[3].f));
|
||||
break;
|
||||
#if FEATURE_NV_vertex_program
|
||||
case OPCODE_EXECUTE_PROGRAM_NV:
|
||||
{
|
||||
GLfloat v[4];
|
||||
v[0] = n[3].f;
|
||||
v[1] = n[4].f;
|
||||
v[2] = n[5].f;
|
||||
v[3] = n[6].f;
|
||||
CALL_ExecuteProgramNV(ctx->Exec, (n[1].e, n[2].ui, v));
|
||||
}
|
||||
break;
|
||||
case OPCODE_REQUEST_RESIDENT_PROGRAMS_NV:
|
||||
CALL_RequestResidentProgramsNV(ctx->Exec, (n[1].ui,
|
||||
(GLuint *) n[2].data));
|
||||
break;
|
||||
case OPCODE_LOAD_PROGRAM_NV:
|
||||
CALL_LoadProgramNV(ctx->Exec, (n[1].e, n[2].ui, n[3].i,
|
||||
(const GLubyte *) n[4].data));
|
||||
break;
|
||||
case OPCODE_TRACK_MATRIX_NV:
|
||||
CALL_TrackMatrixNV(ctx->Exec, (n[1].e, n[2].ui, n[3].e, n[4].e));
|
||||
break;
|
||||
#endif
|
||||
|
||||
#if FEATURE_NV_fragment_program
|
||||
case OPCODE_PROGRAM_NAMED_PARAMETER_NV:
|
||||
CALL_ProgramNamedParameter4fNV(ctx->Exec, (n[1].ui, n[2].i,
|
||||
(const GLubyte *) n[3].
|
||||
data, n[4].f, n[5].f,
|
||||
n[6].f, n[7].f));
|
||||
break;
|
||||
#endif
|
||||
|
||||
case OPCODE_DEPTH_BOUNDS_EXT:
|
||||
CALL_DepthBoundsEXT(ctx->Exec, (n[1].f, n[2].f));
|
||||
|
@ -5359,10 +5160,6 @@ execute_list(struct gl_context *ctx, GLuint list)
|
|||
}
|
||||
break;
|
||||
|
||||
case OPCODE_TEXTURE_BARRIER_NV:
|
||||
CALL_TextureBarrierNV(ctx->Exec, ());
|
||||
break;
|
||||
|
||||
case OPCODE_CONTINUE:
|
||||
n = (Node *) n[1].next;
|
||||
break;
|
||||
|
@ -6175,56 +5972,6 @@ exec_GetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params)
|
|||
CALL_GetConvolutionParameteriv(ctx->Exec, (target, pname, params));
|
||||
}
|
||||
|
||||
static void GLAPIENTRY
|
||||
exec_GetHistogram(GLenum target, GLboolean reset, GLenum format,
|
||||
GLenum type, GLvoid *values)
|
||||
{
|
||||
GET_CURRENT_CONTEXT(ctx);
|
||||
FLUSH_VERTICES(ctx, 0);
|
||||
CALL_GetHistogram(ctx->Exec, (target, reset, format, type, values));
|
||||
}
|
||||
|
||||
static void GLAPIENTRY
|
||||
exec_GetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params)
|
||||
{
|
||||
GET_CURRENT_CONTEXT(ctx);
|
||||
FLUSH_VERTICES(ctx, 0);
|
||||
CALL_GetHistogramParameterfv(ctx->Exec, (target, pname, params));
|
||||
}
|
||||
|
||||
static void GLAPIENTRY
|
||||
exec_GetHistogramParameteriv(GLenum target, GLenum pname, GLint *params)
|
||||
{
|
||||
GET_CURRENT_CONTEXT(ctx);
|
||||
FLUSH_VERTICES(ctx, 0);
|
||||
CALL_GetHistogramParameteriv(ctx->Exec, (target, pname, params));
|
||||
}
|
||||
|
||||
static void GLAPIENTRY
|
||||
exec_GetMinmax(GLenum target, GLboolean reset, GLenum format,
|
||||
GLenum type, GLvoid *values)
|
||||
{
|
||||
GET_CURRENT_CONTEXT(ctx);
|
||||
FLUSH_VERTICES(ctx, 0);
|
||||
CALL_GetMinmax(ctx->Exec, (target, reset, format, type, values));
|
||||
}
|
||||
|
||||
static void GLAPIENTRY
|
||||
exec_GetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params)
|
||||
{
|
||||
GET_CURRENT_CONTEXT(ctx);
|
||||
FLUSH_VERTICES(ctx, 0);
|
||||
CALL_GetMinmaxParameterfv(ctx->Exec, (target, pname, params));
|
||||
}
|
||||
|
||||
static void GLAPIENTRY
|
||||
exec_GetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params)
|
||||
{
|
||||
GET_CURRENT_CONTEXT(ctx);
|
||||
FLUSH_VERTICES(ctx, 0);
|
||||
CALL_GetMinmaxParameteriv(ctx->Exec, (target, pname, params));
|
||||
}
|
||||
|
||||
static void GLAPIENTRY
|
||||
exec_GetSeparableFilter(GLenum target, GLenum format, GLenum type,
|
||||
GLvoid *row, GLvoid *column, GLvoid *span)
|
||||
|
@ -6606,17 +6353,7 @@ _mesa_create_save_table(void)
|
|||
SET_GetConvolutionFilter(table, exec_GetConvolutionFilter);
|
||||
SET_GetConvolutionParameterfv(table, exec_GetConvolutionParameterfv);
|
||||
SET_GetConvolutionParameteriv(table, exec_GetConvolutionParameteriv);
|
||||
SET_GetHistogram(table, exec_GetHistogram);
|
||||
SET_GetHistogramParameterfv(table, exec_GetHistogramParameterfv);
|
||||
SET_GetHistogramParameteriv(table, exec_GetHistogramParameteriv);
|
||||
SET_GetMinmax(table, exec_GetMinmax);
|
||||
SET_GetMinmaxParameterfv(table, exec_GetMinmaxParameterfv);
|
||||
SET_GetMinmaxParameteriv(table, exec_GetMinmaxParameteriv);
|
||||
SET_GetSeparableFilter(table, exec_GetSeparableFilter);
|
||||
SET_Histogram(table, save_Histogram);
|
||||
SET_Minmax(table, save_Minmax);
|
||||
SET_ResetHistogram(table, save_ResetHistogram);
|
||||
SET_ResetMinmax(table, save_ResetMinmax);
|
||||
SET_SeparableFilter2D(table, exec_SeparableFilter2D);
|
||||
|
||||
/* 2. GL_EXT_blend_color */
|
||||
|
@ -6696,36 +6433,6 @@ _mesa_create_save_table(void)
|
|||
SET_MultiModeDrawArraysIBM(table, exec_MultiModeDrawArraysIBM);
|
||||
SET_MultiModeDrawElementsIBM(table, exec_MultiModeDrawElementsIBM);
|
||||
|
||||
#if FEATURE_NV_vertex_program
|
||||
/* 233. GL_NV_vertex_program */
|
||||
/* The following commands DO NOT go into display lists:
|
||||
* AreProgramsResidentNV, IsProgramNV, GenProgramsNV, DeleteProgramsNV,
|
||||
* VertexAttribPointerNV, GetProgram*, GetVertexAttrib*
|
||||
*/
|
||||
SET_ExecuteProgramNV(table, save_ExecuteProgramNV);
|
||||
SET_AreProgramsResidentNV(table, _mesa_AreProgramsResidentNV);
|
||||
SET_RequestResidentProgramsNV(table, save_RequestResidentProgramsNV);
|
||||
SET_GetProgramParameterfvNV(table, _mesa_GetProgramParameterfvNV);
|
||||
SET_GetProgramParameterdvNV(table, _mesa_GetProgramParameterdvNV);
|
||||
SET_GetTrackMatrixivNV(table, _mesa_GetTrackMatrixivNV);
|
||||
SET_LoadProgramNV(table, save_LoadProgramNV);
|
||||
SET_ProgramParameters4dvNV(table, save_ProgramParameters4dvNV);
|
||||
SET_ProgramParameters4fvNV(table, save_ProgramParameters4fvNV);
|
||||
SET_TrackMatrixNV(table, save_TrackMatrixNV);
|
||||
#endif
|
||||
|
||||
/* 282. GL_NV_fragment_program */
|
||||
#if FEATURE_NV_fragment_program
|
||||
SET_ProgramNamedParameter4fNV(table, save_ProgramNamedParameter4fNV);
|
||||
SET_ProgramNamedParameter4dNV(table, save_ProgramNamedParameter4dNV);
|
||||
SET_ProgramNamedParameter4fvNV(table, save_ProgramNamedParameter4fvNV);
|
||||
SET_ProgramNamedParameter4dvNV(table, save_ProgramNamedParameter4dvNV);
|
||||
SET_GetProgramNamedParameterfvNV(table,
|
||||
_mesa_GetProgramNamedParameterfvNV);
|
||||
SET_GetProgramNamedParameterdvNV(table,
|
||||
_mesa_GetProgramNamedParameterdvNV);
|
||||
#endif
|
||||
|
||||
/* 262. GL_NV_point_sprite */
|
||||
SET_PointParameteriNV(table, save_PointParameteriNV);
|
||||
SET_PointParameterivNV(table, save_PointParameterivNV);
|
||||
|
@ -6773,9 +6480,6 @@ _mesa_create_save_table(void)
|
|||
SET_GetTexParameterIivEXT(table, exec_GetTexParameterIiv);
|
||||
SET_GetTexParameterIuivEXT(table, exec_GetTexParameterIuiv);
|
||||
|
||||
/* GL_NV_texture_barrier */
|
||||
SET_TextureBarrierNV(table, save_TextureBarrierNV);
|
||||
|
||||
/* GL_ARB_texture_storage (no dlist support) */
|
||||
SET_TexStorage1D(table, _mesa_TexStorage1D);
|
||||
SET_TexStorage2D(table, _mesa_TexStorage2D);
|
||||
|
|
|
@ -99,7 +99,6 @@ static const struct extension extension_table[] = {
|
|||
{ "GL_EXT_shadow_funcs", o(EXT_shadow_funcs), 2002 },
|
||||
{ "GL_EXT_stencil_wrap", o(dummy_true), 2002 },
|
||||
{ "GL_EXT_subtexture", o(dummy_true), 1995 },
|
||||
{ "GL_EXT_texture3D", o(EXT_texture3D), 1996 },
|
||||
{ "GL_EXT_texture_cube_map", o(ARB_texture_cube_map), 2001 },
|
||||
{ "GL_EXT_texture_env_add", o(dummy_true), 1999 },
|
||||
{ "GL_EXT_texture_env_combine", o(dummy_true), 2000 },
|
||||
|
@ -127,7 +126,6 @@ static const struct extension extension_table[] = {
|
|||
{ "GL_NV_light_max_exponent", o(NV_light_max_exponent), 1999 },
|
||||
{ "GL_NV_point_sprite", o(NV_point_sprite), 2001 },
|
||||
{ "GL_NV_texgen_reflection", o(NV_texgen_reflection), 1999 },
|
||||
{ "GL_NV_texture_barrier", o(NV_texture_barrier), 2009 },
|
||||
{ "GL_NV_texture_env_combine4", o(NV_texture_env_combine4), 1999 },
|
||||
|
||||
{ 0, 0, 0},
|
||||
|
@ -175,7 +173,6 @@ static const size_t default_extensions[] = {
|
|||
o(EXT_packed_pixels),
|
||||
o(EXT_rescale_normal),
|
||||
o(EXT_separate_specular_color),
|
||||
o(EXT_texture3D),
|
||||
|
||||
/* Vendor Extensions */
|
||||
o(APPLE_packed_pixels),
|
||||
|
|
|
@ -157,7 +157,7 @@ union value {
|
|||
#define CONTEXT_FIELD(field, type) \
|
||||
LOC_CONTEXT, type, offsetof(struct gl_context, field)
|
||||
#define ARRAY_FIELD(field, type) \
|
||||
LOC_ARRAY, type, offsetof(struct gl_array_object, field)
|
||||
LOC_ARRAY, type, offsetof(struct gl_array_attrib, field)
|
||||
#define CONST(value) \
|
||||
LOC_CONTEXT, TYPE_CONST, value
|
||||
|
||||
|
@ -487,11 +487,11 @@ static const struct value_desc values[] = {
|
|||
|
||||
/* GL_ARB_vertex_buffer_object */
|
||||
{ GL_VERTEX_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT,
|
||||
offsetof(struct gl_array_object, VertexAttrib[VERT_ATTRIB_POS].BufferObj), NO_EXTRA },
|
||||
offsetof(struct gl_array_attrib, VertexAttrib[VERT_ATTRIB_POS].BufferObj), NO_EXTRA },
|
||||
{ GL_NORMAL_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT,
|
||||
offsetof(struct gl_array_object, VertexAttrib[VERT_ATTRIB_NORMAL].BufferObj), NO_EXTRA },
|
||||
offsetof(struct gl_array_attrib, VertexAttrib[VERT_ATTRIB_NORMAL].BufferObj), NO_EXTRA },
|
||||
{ GL_COLOR_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT,
|
||||
offsetof(struct gl_array_object, VertexAttrib[VERT_ATTRIB_COLOR0].BufferObj), NO_EXTRA },
|
||||
offsetof(struct gl_array_attrib, VertexAttrib[VERT_ATTRIB_COLOR0].BufferObj), NO_EXTRA },
|
||||
{ GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT, NO_OFFSET, NO_EXTRA },
|
||||
|
||||
/* GL_OES_point_sprite */
|
||||
|
@ -723,13 +723,13 @@ static const struct value_desc values[] = {
|
|||
|
||||
/* GL_ARB_vertex_buffer_object */
|
||||
{ GL_INDEX_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT,
|
||||
offsetof(struct gl_array_object, VertexAttrib[VERT_ATTRIB_COLOR_INDEX].BufferObj), NO_EXTRA },
|
||||
offsetof(struct gl_array_attrib, VertexAttrib[VERT_ATTRIB_COLOR_INDEX].BufferObj), NO_EXTRA },
|
||||
{ GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT,
|
||||
offsetof(struct gl_array_object, VertexAttrib[VERT_ATTRIB_EDGEFLAG].BufferObj), NO_EXTRA },
|
||||
offsetof(struct gl_array_attrib, VertexAttrib[VERT_ATTRIB_EDGEFLAG].BufferObj), NO_EXTRA },
|
||||
{ GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT,
|
||||
offsetof(struct gl_array_object, VertexAttrib[VERT_ATTRIB_COLOR1].BufferObj), NO_EXTRA },
|
||||
offsetof(struct gl_array_attrib, VertexAttrib[VERT_ATTRIB_COLOR1].BufferObj), NO_EXTRA },
|
||||
{ GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT,
|
||||
offsetof(struct gl_array_object, VertexAttrib[VERT_ATTRIB_FOG].BufferObj), NO_EXTRA },
|
||||
offsetof(struct gl_array_attrib, VertexAttrib[VERT_ATTRIB_FOG].BufferObj), NO_EXTRA },
|
||||
|
||||
/* GL_EXT_depth_bounds_test */
|
||||
{ GL_DEPTH_BOUNDS_TEST_EXT, CONTEXT_BOOL(Depth.BoundsTest),
|
||||
|
|
|
@ -1,147 +0,0 @@
|
|||
/*
|
||||
* Mesa 3-D graphics library
|
||||
* Version: 6.3
|
||||
*
|
||||
* Copyright (C) 1999-2004 Brian Paul All Rights Reserved.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
* BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
|
||||
* AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <precomp.h>
|
||||
|
||||
#include "histogram.h"
|
||||
|
||||
#if FEATURE_histogram
|
||||
|
||||
/**********************************************************************
|
||||
* API functions
|
||||
*/
|
||||
|
||||
|
||||
/* this is defined below */
|
||||
static void GLAPIENTRY _mesa_ResetMinmax(GLenum target);
|
||||
|
||||
|
||||
static void GLAPIENTRY
|
||||
_mesa_GetMinmax(GLenum target, GLboolean reset, GLenum format,
|
||||
GLenum type, GLvoid *values)
|
||||
{
|
||||
GET_CURRENT_CONTEXT(ctx);
|
||||
|
||||
_mesa_error(ctx, GL_INVALID_OPERATION, "glGetMinmax");
|
||||
}
|
||||
|
||||
|
||||
static void GLAPIENTRY
|
||||
_mesa_GetHistogram(GLenum target, GLboolean reset, GLenum format,
|
||||
GLenum type, GLvoid *values)
|
||||
{
|
||||
GET_CURRENT_CONTEXT(ctx);
|
||||
|
||||
_mesa_error(ctx, GL_INVALID_OPERATION, "glGetHistogram");
|
||||
}
|
||||
|
||||
|
||||
static void GLAPIENTRY
|
||||
_mesa_GetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params)
|
||||
{
|
||||
GET_CURRENT_CONTEXT(ctx);
|
||||
|
||||
_mesa_error(ctx, GL_INVALID_OPERATION, "glGetHistogramParameterfv");
|
||||
}
|
||||
|
||||
|
||||
static void GLAPIENTRY
|
||||
_mesa_GetHistogramParameteriv(GLenum target, GLenum pname, GLint *params)
|
||||
{
|
||||
GET_CURRENT_CONTEXT(ctx);
|
||||
|
||||
_mesa_error(ctx, GL_INVALID_OPERATION, "glGetHistogramParameteriv");
|
||||
}
|
||||
|
||||
|
||||
static void GLAPIENTRY
|
||||
_mesa_GetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params)
|
||||
{
|
||||
GET_CURRENT_CONTEXT(ctx);
|
||||
|
||||
_mesa_error(ctx, GL_INVALID_OPERATION, "glGetMinmaxParameterfv");
|
||||
}
|
||||
|
||||
|
||||
static void GLAPIENTRY
|
||||
_mesa_GetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params)
|
||||
{
|
||||
GET_CURRENT_CONTEXT(ctx);
|
||||
|
||||
_mesa_error(ctx, GL_INVALID_OPERATION, "glGetMinmaxParameteriv");
|
||||
}
|
||||
|
||||
|
||||
static void GLAPIENTRY
|
||||
_mesa_Histogram(GLenum target, GLsizei width, GLenum internalFormat, GLboolean sink)
|
||||
{
|
||||
GET_CURRENT_CONTEXT(ctx);
|
||||
|
||||
_mesa_error(ctx, GL_INVALID_OPERATION, "glHistogram");
|
||||
}
|
||||
|
||||
|
||||
static void GLAPIENTRY
|
||||
_mesa_Minmax(GLenum target, GLenum internalFormat, GLboolean sink)
|
||||
{
|
||||
GET_CURRENT_CONTEXT(ctx);
|
||||
|
||||
_mesa_error(ctx, GL_INVALID_OPERATION, "glMinmax");
|
||||
}
|
||||
|
||||
|
||||
static void GLAPIENTRY
|
||||
_mesa_ResetHistogram(GLenum target)
|
||||
{
|
||||
GET_CURRENT_CONTEXT(ctx);
|
||||
|
||||
_mesa_error(ctx, GL_INVALID_OPERATION, "glResetHistogram");
|
||||
}
|
||||
|
||||
|
||||
static void GLAPIENTRY
|
||||
_mesa_ResetMinmax(GLenum target)
|
||||
{
|
||||
GET_CURRENT_CONTEXT(ctx);
|
||||
|
||||
_mesa_error(ctx, GL_INVALID_OPERATION, "glResetMinmax");
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
_mesa_init_histogram_dispatch(struct _glapi_table *disp)
|
||||
{
|
||||
SET_GetHistogram(disp, _mesa_GetHistogram);
|
||||
SET_GetHistogramParameterfv(disp, _mesa_GetHistogramParameterfv);
|
||||
SET_GetHistogramParameteriv(disp, _mesa_GetHistogramParameteriv);
|
||||
SET_GetMinmax(disp, _mesa_GetMinmax);
|
||||
SET_GetMinmaxParameterfv(disp, _mesa_GetMinmaxParameterfv);
|
||||
SET_GetMinmaxParameteriv(disp, _mesa_GetMinmaxParameteriv);
|
||||
SET_Histogram(disp, _mesa_Histogram);
|
||||
SET_Minmax(disp, _mesa_Minmax);
|
||||
SET_ResetHistogram(disp, _mesa_ResetHistogram);
|
||||
SET_ResetMinmax(disp, _mesa_ResetMinmax);
|
||||
}
|
||||
|
||||
#endif /* FEATURE_histogram */
|
|
@ -1,58 +0,0 @@
|
|||
/**
|
||||
* \file histogram.h
|
||||
* Histogram.
|
||||
*
|
||||
* \if subset
|
||||
* (No-op)
|
||||
*
|
||||
* \endif
|
||||
*/
|
||||
|
||||
/*
|
||||
* Mesa 3-D graphics library
|
||||
* Version: 5.1
|
||||
*
|
||||
* Copyright (C) 1999-2003 Brian Paul All Rights Reserved.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included
|
||||
* in all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
* BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
|
||||
* AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
|
||||
#ifndef HISTOGRAM_H
|
||||
#define HISTOGRAM_H
|
||||
|
||||
#include "compiler.h"
|
||||
#include "mfeatures.h"
|
||||
|
||||
struct _glapi_table;
|
||||
|
||||
#if FEATURE_histogram
|
||||
|
||||
extern void
|
||||
_mesa_init_histogram_dispatch(struct _glapi_table *disp);
|
||||
|
||||
#else /* FEATURE_histogram */
|
||||
|
||||
static inline void
|
||||
_mesa_init_histogram_dispatch(struct _glapi_table *disp)
|
||||
{
|
||||
}
|
||||
|
||||
#endif /* FEATURE_histogram */
|
||||
|
||||
#endif /* HISTOGRAM_H */
|
|
@ -78,12 +78,6 @@
|
|||
#define FEATURE_GL !FEATURE_ES
|
||||
#endif
|
||||
|
||||
#if defined(IN_DRI_DRIVER) || (FEATURE_GL + FEATURE_ES1 + FEATURE_ES2 > 1)
|
||||
#define FEATURE_remap_table 1
|
||||
#else
|
||||
#define FEATURE_remap_table 0
|
||||
#endif
|
||||
|
||||
#define FEATURE_dispatch 1
|
||||
#define FEATURE_texgen 1
|
||||
#define FEATURE_userclip 1
|
||||
|
|
|
@ -1190,39 +1190,6 @@ struct gl_client_array
|
|||
};
|
||||
|
||||
|
||||
/**
|
||||
* Collection of vertex arrays. Defined by the GL_APPLE_vertex_array_object
|
||||
* extension, but a nice encapsulation in any case.
|
||||
*/
|
||||
struct gl_array_object
|
||||
{
|
||||
/** Name of the array object as received from glGenVertexArrayAPPLE. */
|
||||
GLuint Name;
|
||||
|
||||
GLint RefCount;
|
||||
_glthread_Mutex Mutex;
|
||||
|
||||
/**
|
||||
* Has this array object been bound?
|
||||
*/
|
||||
GLboolean _Used;
|
||||
|
||||
/** Vertex attribute arrays */
|
||||
struct gl_client_array VertexAttrib[VERT_ATTRIB_MAX];
|
||||
|
||||
/** Mask of VERT_BIT_* values indicating which arrays are enabled */
|
||||
GLbitfield64 _Enabled;
|
||||
|
||||
/**
|
||||
* Min of all enabled arrays' _MaxElement. When arrays reside inside VBOs
|
||||
* we can determine the max legal (in bounds) glDrawElements array index.
|
||||
*/
|
||||
GLuint _MaxElement;
|
||||
|
||||
struct gl_buffer_object *ElementArrayBufferObj;
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* Vertex array state
|
||||
*/
|
||||
|
@ -1481,17 +1448,6 @@ struct gl_framebuffer
|
|||
void (*Delete)(struct gl_framebuffer *fb);
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* Precision info for shader datatypes. See glGetShaderPrecisionFormat().
|
||||
*/
|
||||
struct gl_precision
|
||||
{
|
||||
GLushort RangeMin; /**< min value exponent */
|
||||
GLushort RangeMax; /**< max value exponent */
|
||||
GLushort Precision; /**< number of mantissa bits */
|
||||
};
|
||||
|
||||
/**
|
||||
* Constants which may be overridden by device driver during context creation
|
||||
* but are never changed after that.
|
||||
|
@ -1588,7 +1544,6 @@ struct gl_extensions
|
|||
GLboolean EXT_secondary_color;
|
||||
GLboolean EXT_separate_shader_objects;
|
||||
GLboolean EXT_separate_specular_color;
|
||||
GLboolean EXT_texture3D;
|
||||
GLboolean EXT_texture_env_dot3;
|
||||
GLboolean EXT_texture_filter_anisotropic;
|
||||
GLboolean EXT_texture_integer;
|
||||
|
@ -1604,7 +1559,6 @@ struct gl_extensions
|
|||
GLboolean NV_fog_distance;
|
||||
GLboolean NV_light_max_exponent;
|
||||
GLboolean NV_point_sprite;
|
||||
GLboolean NV_texture_barrier;
|
||||
GLboolean NV_texgen_reflection;
|
||||
GLboolean NV_texture_env_combine4;
|
||||
GLboolean extension_sentinel;
|
||||
|
@ -1673,8 +1627,7 @@ struct gl_matrix_stack
|
|||
#define _NEW_BUFFERS (1 << 22) /**< gl_context::Visual, DrawBuffer, */
|
||||
#define _NEW_CURRENT_ATTRIB (1 << 23) /**< gl_context::Current */
|
||||
#define _NEW_MULTISAMPLE (1 << 24) /**< gl_context::Multisample */
|
||||
#define _NEW_TRACK_MATRIX (1 << 25) /**< gl_context::VertexProgram */
|
||||
#define _NEW_BUFFER_OBJECT (1 << 26)
|
||||
#define _NEW_BUFFER_OBJECT (1 << 25)
|
||||
#define _NEW_ALL ~0
|
||||
|
||||
/**
|
||||
|
|
|
@ -70,7 +70,6 @@
|
|||
#include "texstate.h"
|
||||
#include "texstorage.h"
|
||||
#include "texstore.h"
|
||||
#include "texturebarrier.h"
|
||||
#include "varray.h"
|
||||
#include "version.h"
|
||||
#include "viewport.h"
|
||||
|
|
|
@ -1,52 +0,0 @@
|
|||
/*
|
||||
* Copyright © 2011 Marek Olšák <maraeo@gmail.com>
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice (including the next
|
||||
* paragraph) shall be included in all copies or substantial portions of the
|
||||
* Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
* DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file texturebarrier.c
|
||||
* Implementation of glTextureBarrierNV.
|
||||
*
|
||||
* \author Marek Olšák <maraeo@gmail.com>
|
||||
*/
|
||||
|
||||
#include <precomp.h>
|
||||
|
||||
static void
|
||||
_mesa_texture_barrier(struct gl_context *ctx)
|
||||
{
|
||||
/* no-op */
|
||||
}
|
||||
|
||||
void
|
||||
_mesa_init_texture_barrier_functions(struct dd_function_table *driver)
|
||||
{
|
||||
driver->TextureBarrier = _mesa_texture_barrier;
|
||||
}
|
||||
|
||||
void GLAPIENTRY
|
||||
_mesa_TextureBarrierNV(void)
|
||||
{
|
||||
GET_CURRENT_CONTEXT(ctx);
|
||||
ASSERT_OUTSIDE_BEGIN_END(ctx);
|
||||
|
||||
ctx->Driver.TextureBarrier(ctx);
|
||||
}
|
|
@ -1,44 +0,0 @@
|
|||
/*
|
||||
* Copyright © 2011 Marek Olšák <maraeo@gmail.com>
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice (including the next
|
||||
* paragraph) shall be included in all copies or substantial portions of the
|
||||
* Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
* DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file texturebarrier.h
|
||||
* GL_NV_texture_barrier
|
||||
*
|
||||
* \author Marek Olšák <maraeo@gmail.com>
|
||||
*/
|
||||
|
||||
#ifndef TEXTUREBARRIER_H
|
||||
#define TEXTUREBARRIER_H
|
||||
|
||||
#include "glheader.h"
|
||||
|
||||
struct dd_function_table;
|
||||
|
||||
extern void
|
||||
_mesa_init_texture_barrier_functions(struct dd_function_table *driver);
|
||||
|
||||
extern void GLAPIENTRY
|
||||
_mesa_TextureBarrierNV(void);
|
||||
|
||||
#endif /* TEXTUREBARRIER_H */
|
Loading…
Reference in a new issue