mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2025-12-23 15:30:14 +01:00
mesa: Eliminate parameters to dd_function_table::Viewport
No driver uses them. They will just be annoying in future patches. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
parent
fbc0c9a553
commit
065bd6ffc2
10 changed files with 11 additions and 50 deletions
|
|
@ -271,17 +271,11 @@ intel_prepare_render(struct intel_context *intel)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
intel_noninvalidate_viewport(struct gl_context *ctx, GLint x, GLint y,
|
intel_noninvalidate_viewport(struct gl_context *ctx)
|
||||||
GLsizei w, GLsizei h)
|
|
||||||
{
|
{
|
||||||
struct intel_context *intel = intel_context(ctx);
|
struct intel_context *intel = intel_context(ctx);
|
||||||
__DRIcontext *driContext = intel->driContext;
|
__DRIcontext *driContext = intel->driContext;
|
||||||
|
|
||||||
(void) x;
|
|
||||||
(void) y;
|
|
||||||
(void) w;
|
|
||||||
(void) h;
|
|
||||||
|
|
||||||
intelCalcViewport(ctx);
|
intelCalcViewport(ctx);
|
||||||
|
|
||||||
if (_mesa_is_winsys_fbo(ctx->DrawBuffer)) {
|
if (_mesa_is_winsys_fbo(ctx->DrawBuffer)) {
|
||||||
|
|
@ -291,13 +285,8 @@ intel_noninvalidate_viewport(struct gl_context *ctx, GLint x, GLint y,
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
intel_viewport(struct gl_context *ctx, GLint x, GLint y, GLsizei w, GLsizei h)
|
intel_viewport(struct gl_context *ctx)
|
||||||
{
|
{
|
||||||
(void) x;
|
|
||||||
(void) y;
|
|
||||||
(void) w;
|
|
||||||
(void) h;
|
|
||||||
|
|
||||||
intelCalcViewport(ctx);
|
intelCalcViewport(ctx);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -134,16 +134,11 @@ intelGetString(struct gl_context * ctx, GLenum name)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
intel_viewport(struct gl_context *ctx, GLint x, GLint y, GLsizei w, GLsizei h)
|
intel_viewport(struct gl_context *ctx)
|
||||||
{
|
{
|
||||||
struct brw_context *brw = brw_context(ctx);
|
struct brw_context *brw = brw_context(ctx);
|
||||||
__DRIcontext *driContext = brw->driContext;
|
__DRIcontext *driContext = brw->driContext;
|
||||||
|
|
||||||
(void) x;
|
|
||||||
(void) y;
|
|
||||||
(void) w;
|
|
||||||
(void) h;
|
|
||||||
|
|
||||||
if (_mesa_is_winsys_fbo(ctx->DrawBuffer)) {
|
if (_mesa_is_winsys_fbo(ctx->DrawBuffer)) {
|
||||||
dri2InvalidateDrawable(driContext->driDrawablePriv);
|
dri2InvalidateDrawable(driContext->driDrawablePriv);
|
||||||
dri2InvalidateDrawable(driContext->driReadablePriv);
|
dri2InvalidateDrawable(driContext->driReadablePriv);
|
||||||
|
|
|
||||||
|
|
@ -1600,14 +1600,8 @@ void r200_vtbl_update_scissor( struct gl_context *ctx )
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void r200Viewport( struct gl_context *ctx, GLint x, GLint y,
|
static void r200Viewport(struct gl_context *ctx)
|
||||||
GLsizei width, GLsizei height )
|
|
||||||
{
|
{
|
||||||
(void) x;
|
|
||||||
(void) y;
|
|
||||||
(void) width;
|
|
||||||
(void) height;
|
|
||||||
|
|
||||||
/* Don't pipeline viewport changes, conflict with window offset
|
/* Don't pipeline viewport changes, conflict with window offset
|
||||||
* setting below. Could apply deltas to rescue pipelined viewport
|
* setting below. Could apply deltas to rescue pipelined viewport
|
||||||
* values, or keep the originals hanging around.
|
* values, or keep the originals hanging around.
|
||||||
|
|
|
||||||
|
|
@ -1383,14 +1383,8 @@ void radeonUpdateWindow( struct gl_context *ctx )
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void radeonViewport( struct gl_context *ctx, GLint x, GLint y,
|
static void radeonViewport(struct gl_context *ctx)
|
||||||
GLsizei width, GLsizei height )
|
|
||||||
{
|
{
|
||||||
(void) x;
|
|
||||||
(void) y;
|
|
||||||
(void) width;
|
|
||||||
(void) height;
|
|
||||||
|
|
||||||
/* Don't pipeline viewport changes, conflict with window offset
|
/* Don't pipeline viewport changes, conflict with window offset
|
||||||
* setting below. Could apply deltas to rescue pipelined viewport
|
* setting below. Could apply deltas to rescue pipelined viewport
|
||||||
* values, or keep the originals hanging around.
|
* values, or keep the originals hanging around.
|
||||||
|
|
|
||||||
|
|
@ -618,15 +618,11 @@ update_state( struct gl_context *ctx, GLuint new_state )
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
viewport(struct gl_context *ctx, GLint x, GLint y, GLsizei w, GLsizei h)
|
viewport(struct gl_context *ctx)
|
||||||
{
|
{
|
||||||
struct gl_framebuffer *draw = ctx->WinSysDrawBuffer;
|
struct gl_framebuffer *draw = ctx->WinSysDrawBuffer;
|
||||||
struct gl_framebuffer *read = ctx->WinSysReadBuffer;
|
struct gl_framebuffer *read = ctx->WinSysReadBuffer;
|
||||||
|
|
||||||
(void) x;
|
|
||||||
(void) y;
|
|
||||||
(void) w;
|
|
||||||
(void) h;
|
|
||||||
swrast_check_and_update_window_size(ctx, draw);
|
swrast_check_and_update_window_size(ctx, draw);
|
||||||
swrast_check_and_update_window_size(ctx, read);
|
swrast_check_and_update_window_size(ctx, read);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -484,9 +484,7 @@ wmesa_resize_buffers(struct gl_context *ctx, struct gl_framebuffer *buffer,
|
||||||
* we get the viewport set correctly, even if the app does not call
|
* we get the viewport set correctly, even if the app does not call
|
||||||
* glViewport and relies on the defaults.
|
* glViewport and relies on the defaults.
|
||||||
*/
|
*/
|
||||||
static void wmesa_viewport(struct gl_context *ctx,
|
static void wmesa_viewport(struct gl_context *ctx)
|
||||||
GLint x, GLint y,
|
|
||||||
GLsizei width, GLsizei height)
|
|
||||||
{
|
{
|
||||||
GLuint new_width, new_height;
|
GLuint new_width, new_height;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -750,17 +750,13 @@ xmesa_update_state( struct gl_context *ctx, GLbitfield new_state )
|
||||||
* That problem led to the GLX_MESA_resize_buffers extension.
|
* That problem led to the GLX_MESA_resize_buffers extension.
|
||||||
*/
|
*/
|
||||||
static void
|
static void
|
||||||
xmesa_viewport(struct gl_context *ctx, GLint x, GLint y, GLsizei w, GLsizei h)
|
xmesa_viewport(struct gl_context *ctx)
|
||||||
{
|
{
|
||||||
XMesaContext xmctx = XMESA_CONTEXT(ctx);
|
XMesaContext xmctx = XMESA_CONTEXT(ctx);
|
||||||
XMesaBuffer xmdrawbuf = XMESA_BUFFER(ctx->WinSysDrawBuffer);
|
XMesaBuffer xmdrawbuf = XMESA_BUFFER(ctx->WinSysDrawBuffer);
|
||||||
XMesaBuffer xmreadbuf = XMESA_BUFFER(ctx->WinSysReadBuffer);
|
XMesaBuffer xmreadbuf = XMESA_BUFFER(ctx->WinSysReadBuffer);
|
||||||
xmesa_check_and_update_buffer_size(xmctx, xmdrawbuf);
|
xmesa_check_and_update_buffer_size(xmctx, xmdrawbuf);
|
||||||
xmesa_check_and_update_buffer_size(xmctx, xmreadbuf);
|
xmesa_check_and_update_buffer_size(xmctx, xmreadbuf);
|
||||||
(void) x;
|
|
||||||
(void) y;
|
|
||||||
(void) w;
|
|
||||||
(void) h;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -547,7 +547,7 @@ struct dd_function_table {
|
||||||
struct gl_texture_object *texObj,
|
struct gl_texture_object *texObj,
|
||||||
GLenum pname, const GLfloat *params);
|
GLenum pname, const GLfloat *params);
|
||||||
/** Set the viewport */
|
/** Set the viewport */
|
||||||
void (*Viewport)(struct gl_context *ctx, GLint x, GLint y, GLsizei w, GLsizei h);
|
void (*Viewport)(struct gl_context *ctx);
|
||||||
/*@}*/
|
/*@}*/
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -99,7 +99,7 @@ _mesa_set_viewport(struct gl_context *ctx, GLint x, GLint y,
|
||||||
/* Many drivers will use this call to check for window size changes
|
/* Many drivers will use this call to check for window size changes
|
||||||
* and reallocate the z/stencil/accum/etc buffers if needed.
|
* and reallocate the z/stencil/accum/etc buffers if needed.
|
||||||
*/
|
*/
|
||||||
ctx->Driver.Viewport(ctx, x, y, width, height);
|
ctx->Driver.Viewport(ctx);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -48,8 +48,7 @@ st_ws_framebuffer(struct gl_framebuffer *fb)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void st_viewport(struct gl_context * ctx, GLint x, GLint y,
|
static void st_viewport(struct gl_context *ctx)
|
||||||
GLsizei width, GLsizei height)
|
|
||||||
{
|
{
|
||||||
struct st_context *st = ctx->st;
|
struct st_context *st = ctx->st;
|
||||||
struct st_framebuffer *stdraw;
|
struct st_framebuffer *stdraw;
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue