fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-28 10:20:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: Add new viewport and depth-range entry points for GL_ARB_viewport_array

Browse source 
v2 (idr): Use set_viewport_no_notify / set_depth_range_no_notify (and
manually notify the driver) instead of calling _mesa_set_viewporti /
_mesa_set_depthrangei.  Refactor bodies of _mesa_ViewportIndexed and
_mesa_ViewportIndexedv into a shared function.  Remove spurious CLAMP
calls in _mesa_DepthRangeArrayv and _mesa_DepthRangeIndexed.

v3 (idr): Add some missing return-statements after calls to _mesa_error.

v4 (idr): Only perform the ViewportBounds.Min / ViewportBounds.Max
clamping in set_viewport_no_notify if GL_ARB_viewport_array is enabled.
Otherwise the driver may not have set ViewportBounds, and the clamping
will do bad things.

Signed-off-by: Courtney Goeltzenleuchter <courtney@LunarG.com>
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Courtney Goeltzenleuchter 2013-11-14 10:06:59 -07:00 • committed by Ian Romanick
parent 0a7baa68a8
commit 86231c4ab3
2 changed files with 178 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

164
src/mesa/main/viewport.c
View file

@ -43,6 +43,21 @@ set_viewport_no_notify(struct gl_context *ctx, unsigned idx,
width = MIN2(width, (GLfloat) ctx->Const.MaxViewportWidth);
height = MIN2(height, (GLfloat) ctx->Const.MaxViewportHeight);
/* The GL_ARB_viewport_array spec says:
*
* "The location of the viewport's bottom-left corner, given by (x,y),
* are clamped to be within the implementation-dependent viewport
* bounds range. The viewport bounds range [min, max] tuple may be
* determined by calling GetFloatv with the symbolic constant
* VIEWPORT_BOUNDS_RANGE (see section 6.1)."
*/
if (ctx->Extensions.ARB_viewport_array) {
x = CLAMP(x,
ctx->Const.ViewportBounds.Min, ctx->Const.ViewportBounds.Max);
y = CLAMP(y,
ctx->Const.ViewportBounds.Min, ctx->Const.ViewportBounds.Max);
}
ctx->ViewportArray[idx].X = x;
ctx->ViewportArray[idx].Width = width;
ctx->ViewportArray[idx].Y = y;
@ -65,6 +80,15 @@ set_viewport_no_notify(struct gl_context *ctx, unsigned idx,
#endif
}
struct gl_viewport_inputs {
GLfloat X, Y; /**< position */
GLfloat Width, Height; /**< size */
};
struct gl_depthrange_inputs {
GLdouble Near, Far; /**< Depth buffer range */
};
/**
* Set the viewport.
* \sa Called via glViewport() or display list execution.
@ -135,6 +159,85 @@ _mesa_set_viewport(struct gl_context *ctx, unsigned idx, GLfloat x, GLfloat y,
}
}
void GLAPIENTRY
_mesa_ViewportArrayv(GLuint first, GLsizei count, const GLfloat *v)
{
int i;
const struct gl_viewport_inputs *const p = (struct gl_viewport_inputs *) v;
GET_CURRENT_CONTEXT(ctx);
if (MESA_VERBOSE & VERBOSE_API)
_mesa_debug(ctx, "glViewportArrayv %d %d\n", first, count);
if ((first + count) > ctx->Const.MaxViewports) {
_mesa_error(ctx, GL_INVALID_VALUE,
"glViewportArrayv: first (%d) + count (%d) > MaxViewports "
"(%d)",
first, count, ctx->Const.MaxViewports);
return;
}
/* Verify width & height */
for (i = 0; i < count; i++) {
if (p[i].Width < 0 || p[i].Height < 0) {
_mesa_error(ctx, GL_INVALID_VALUE,
"glViewportArrayv: index (%d) width or height < 0 "
"(%f, %f)",
i + first, p[i].Width, p[i].Height);
return;
}
}
for (i = 0; i < count; i++)
set_viewport_no_notify(ctx, i + first,
p[i].X, p[i].Y,
p[i].Width, p[i].Height);
if (ctx->Driver.Viewport)
ctx->Driver.Viewport(ctx);
}
static void
ViewportIndexedf(GLuint index, GLfloat x, GLfloat y,
GLfloat w, GLfloat h, const char *function)
{
GET_CURRENT_CONTEXT(ctx);
if (MESA_VERBOSE & VERBOSE_API)
_mesa_debug(ctx, "%s(%d, %f, %f, %f, %f)\n",
function, index, x, y, w, h);
if (index >= ctx->Const.MaxViewports) {
_mesa_error(ctx, GL_INVALID_VALUE,
"%s: index (%d) >= MaxViewports (%d)",
function, index, ctx->Const.MaxViewports);
return;
}
/* Verify width & height */
if (w < 0 || h < 0) {
_mesa_error(ctx, GL_INVALID_VALUE,
"%s: index (%d) width or height < 0 (%f, %f)",
function, index, w, h);
return;
}
_mesa_set_viewport(ctx, index, x, y, w, h);
}
void GLAPIENTRY
_mesa_ViewportIndexedf(GLuint index, GLfloat x, GLfloat y,
GLfloat w, GLfloat h)
{
ViewportIndexedf(index, x, y, w, h, "glViewportIndexedf");
}
void GLAPIENTRY
_mesa_ViewportIndexedfv(GLuint index, const GLfloat *v)
{
ViewportIndexedf(index, v[0], v[1], v[2], v[3], "glViewportIndexedfv");
}
static void
set_depth_range_no_notify(struct gl_context *ctx, unsigned idx,
GLclampd nearval, GLclampd farval)
@ -217,6 +320,67 @@ _mesa_DepthRangef(GLclampf nearval, GLclampf farval)
_mesa_DepthRange(nearval, farval);
}
/**
* Update a range DepthRange values
*
* \param first starting array index
* \param count count of DepthRange items to update
* \param v pointer to memory containing
* GLclampd near and far clip-plane values
*/
void GLAPIENTRY
_mesa_DepthRangeArrayv(GLuint first, GLsizei count, const GLclampd *v)
{
int i;
const struct gl_depthrange_inputs *const p =
(struct gl_depthrange_inputs *) v;
GET_CURRENT_CONTEXT(ctx);
if (MESA_VERBOSE & VERBOSE_API)
_mesa_debug(ctx, "glDepthRangeArrayv %d %d\n", first, count);
if ((first + count) > ctx->Const.MaxViewports) {
_mesa_error(ctx, GL_INVALID_VALUE,
"glDepthRangev: first (%d) + count (%d) >= MaxViewports (%d)",
first, count, ctx->Const.MaxViewports);
return;
}
for (i = 0; i < count; i++)
set_depth_range_no_notify(ctx, i + first, p[i].Near, p[i].Far);
if (ctx->Driver.DepthRange)
ctx->Driver.DepthRange(ctx);
}
/**
* Update a single DepthRange
*
* \param index array index to update
* \param nearval specifies the Z buffer value which should correspond to
* the near clip plane
* \param farval specifies the Z buffer value which should correspond to
* the far clip plane
*/
void GLAPIENTRY
_mesa_DepthRangeIndexed(GLuint index, GLclampd nearval, GLclampd farval)
{
GET_CURRENT_CONTEXT(ctx);
if (MESA_VERBOSE & VERBOSE_API)
_mesa_debug(ctx, "glDepthRangeIndexed(%d, %f, %f)\n",
index, nearval, farval);
if (index >= ctx->Const.MaxViewports) {
_mesa_error(ctx, GL_INVALID_VALUE,
"glDepthRangeIndexed: index (%d) >= MaxViewports (%d)",
index, ctx->Const.MaxViewports);
return;
}
_mesa_set_depth_range(ctx, index, nearval, farval);
}
/**
* Initialize the context viewport attribute group.
* \param ctx the GL context.

14
src/mesa/main/viewport.h
View file

@ -34,6 +34,14 @@ struct gl_context;
extern void GLAPIENTRY
_mesa_Viewport(GLint x, GLint y, GLsizei width, GLsizei height);
extern void GLAPIENTRY
_mesa_ViewportArrayv(GLuint first, GLsizei count, const GLfloat * v);
extern void GLAPIENTRY
_mesa_ViewportIndexedf(GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h);
extern void GLAPIENTRY
_mesa_ViewportIndexedfv(GLuint index, const GLfloat * v);
extern void
_mesa_set_viewport(struct gl_context *ctx, unsigned idx, GLfloat x, GLfloat y,
@ -46,6 +54,12 @@ _mesa_DepthRange(GLclampd nearval, GLclampd farval);
extern void GLAPIENTRY
_mesa_DepthRangef(GLclampf nearval, GLclampf farval);
extern void GLAPIENTRY
_mesa_DepthRangeArrayv(GLuint first, GLsizei count, const GLclampd * v);
extern void GLAPIENTRY
_mesa_DepthRangeIndexed(GLuint index, GLclampd n, GLclampd f);
extern void
_mesa_set_depth_range(struct gl_context *ctx, unsigned idx,
GLclampd nearval, GLclampd farval);