OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: make _mesa_accum() static

Browse Source 
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
This commit is contained in:
Timothy Arceri
2017-05-03 13:34:42 +10:00
parent b549f054a6
commit e2f3007665
2 changed files with 54 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
src/mesa/main/accum.c
View File

@@ -53,57 +53,6 @@ _mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha )
} }
void GLAPIENTRY
_mesa_Accum( GLenum op, GLfloat value )
{
GET_CURRENT_CONTEXT(ctx);
FLUSH_VERTICES(ctx, 0);
switch (op) {
case GL_ADD:
case GL_MULT:
case GL_ACCUM:
case GL_LOAD:
case GL_RETURN:
/* OK */
break;
default:
_mesa_error(ctx, GL_INVALID_ENUM, "glAccum(op)");
return;
}
if (ctx->DrawBuffer->Visual.haveAccumBuffer == 0) {
_mesa_error(ctx, GL_INVALID_OPERATION, "glAccum(no accum buffer)");
return;
}
if (ctx->DrawBuffer != ctx->ReadBuffer) {
/* See GLX_SGI_make_current_read or WGL_ARB_make_current_read,
* or GL_EXT_framebuffer_blit.
*/
_mesa_error(ctx, GL_INVALID_OPERATION,
"glAccum(different read/draw buffers)");
return;
}
if (ctx->NewState)
_mesa_update_state(ctx);
if (ctx->DrawBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
_mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,
"glAccum(incomplete framebuffer)");
return;
}
if (ctx->RasterDiscard)
return;
if (ctx->RenderMode == GL_RENDER) {
_mesa_accum(ctx, op, value);
}
}
/** /**
* Clear the accumulation buffer by mapping the renderbuffer and * Clear the accumulation buffer by mapping the renderbuffer and
* writing the clear color to it. Called by the driver's implementation * writing the clear color to it. Called by the driver's implementation
@@ -436,8 +385,8 @@ accum_return(struct gl_context *ctx, GLfloat value,
* signed 16-bit color channels could implement hardware accumulation * signed 16-bit color channels could implement hardware accumulation
* operations, but no driver does so at this time. * operations, but no driver does so at this time.
*/ */
void static void
_mesa_accum(struct gl_context *ctx, GLenum op, GLfloat value) accum(struct gl_context *ctx, GLenum op, GLfloat value)
{ {
GLint xpos, ypos, width, height; GLint xpos, ypos, width, height;
@@ -477,7 +426,7 @@ _mesa_accum(struct gl_context *ctx, GLenum op, GLfloat value)
accum_return(ctx, value, xpos, ypos, width, height); accum_return(ctx, value, xpos, ypos, width, height);
break; break;
default: default:
_mesa_problem(ctx, "invalid mode in _mesa_accum()"); _mesa_problem(ctx, "invalid mode in _mesa_Accum()");
break; break;
} }
} }
@@ -489,3 +438,54 @@ _mesa_init_accum( struct gl_context *ctx )
/* Accumulate buffer group */ /* Accumulate buffer group */
ASSIGN_4V( ctx->Accum.ClearColor, 0.0, 0.0, 0.0, 0.0 ); ASSIGN_4V( ctx->Accum.ClearColor, 0.0, 0.0, 0.0, 0.0 );
} }
void GLAPIENTRY
_mesa_Accum( GLenum op, GLfloat value )
{
GET_CURRENT_CONTEXT(ctx);
FLUSH_VERTICES(ctx, 0);
switch (op) {
case GL_ADD:
case GL_MULT:
case GL_ACCUM:
case GL_LOAD:
case GL_RETURN:
/* OK */
break;
default:
_mesa_error(ctx, GL_INVALID_ENUM, "glAccum(op)");
return;
}
if (ctx->DrawBuffer->Visual.haveAccumBuffer == 0) {
_mesa_error(ctx, GL_INVALID_OPERATION, "glAccum(no accum buffer)");
return;
}
if (ctx->DrawBuffer != ctx->ReadBuffer) {
/* See GLX_SGI_make_current_read or WGL_ARB_make_current_read,
* or GL_EXT_framebuffer_blit.
*/
_mesa_error(ctx, GL_INVALID_OPERATION,
"glAccum(different read/draw buffers)");
return;
}
if (ctx->NewState)
_mesa_update_state(ctx);
if (ctx->DrawBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
_mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,
"glAccum(incomplete framebuffer)");
return;
}
if (ctx->RasterDiscard)
return;
if (ctx->RenderMode == GL_RENDER) {
accum(ctx, op, value);
}
}

3
src/mesa/main/accum.h
View File

@@ -46,9 +46,6 @@ _mesa_ClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha );
void GLAPIENTRY void GLAPIENTRY
_mesa_Accum( GLenum op, GLfloat value ); _mesa_Accum( GLenum op, GLfloat value );
extern void
_mesa_accum(struct gl_context *ctx, GLenum op, GLfloat value);
extern void extern void
_mesa_clear_accum_buffer(struct gl_context *ctx); _mesa_clear_accum_buffer(struct gl_context *ctx);