[Mesa-dev] [PATCH 1/3] i965: Move GL_APPLE_object_purgeable functionality into a new file.
Ian Romanick
idr at freedesktop.org
Fri Aug 16 12:19:56 PDT 2013
On 08/14/2013 12:06 PM, Kenneth Graunke wrote:
> GL_APPLE_object_purgeable creates a mechanism for marking OpenGL objects
> as "purgeable" so they can be thrown away when system resources become
> scarce. It specifically applies to buffer objects, textures, and
> renderbuffers.
>
> The intel_buffer_objects.c file provides core functionality for GL
> buffer objects, such as MapBufferRange and CopyBufferSubData. Having
> texture and renderbuffer functionality in that file is a bit strange.
>
> The 2010 copyright on the new file is because Chris Wilson first added
> this code in January 2010 (commit 755915fa).
>
> Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
> ---
> src/mesa/drivers/dri/i965/Makefile.sources | 1 +
> src/mesa/drivers/dri/i965/brw_context.h | 3 +
> src/mesa/drivers/dri/i965/brw_object_purgeable.c | 173 +++++++++++++++++++++++
> src/mesa/drivers/dri/i965/intel_buffer_objects.c | 136 ------------------
> 4 files changed, 177 insertions(+), 136 deletions(-)
> create mode 100644 src/mesa/drivers/dri/i965/brw_object_purgeable.c
>
> diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources
> index ac8487b..c92573f 100644
> --- a/src/mesa/drivers/dri/i965/Makefile.sources
> +++ b/src/mesa/drivers/dri/i965/Makefile.sources
> @@ -65,6 +65,7 @@ i965_FILES = \
> brw_interpolation_map.c \
> brw_lower_texture_gradients.cpp \
> brw_misc_state.c \
> + brw_object_purgeable.c \
> brw_program.c \
> brw_primitive_restart.c \
> brw_queryobj.c \
> diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h
> index 00dd2b4..e788d14 100644
> --- a/src/mesa/drivers/dri/i965/brw_context.h
> +++ b/src/mesa/drivers/dri/i965/brw_context.h
> @@ -1305,6 +1305,9 @@ void brw_get_depthstencil_tile_masks(struct intel_mipmap_tree *depth_mt,
> void brw_workaround_depthstencil_alignment(struct brw_context *brw,
> GLbitfield clear_mask);
>
> +/* brw_object_purgeable.c */
> +void brw_init_object_purgeable_functions(struct dd_function_table *functions);
> +
> /*======================================================================
> * brw_queryobj.c
> */
> diff --git a/src/mesa/drivers/dri/i965/brw_object_purgeable.c b/src/mesa/drivers/dri/i965/brw_object_purgeable.c
> new file mode 100644
> index 0000000..4630416
> --- /dev/null
> +++ b/src/mesa/drivers/dri/i965/brw_object_purgeable.c
> @@ -0,0 +1,173 @@
> +/*
> + * Copyright © 2010 Intel Corporation
> + *
> + * 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 brw_object_purgeable.c
> + *
> + * The driver implementation of the GL_APPLE_object_purgeable extension.
> + */
> +
> +#include "main/imports.h"
> +#include "main/mtypes.h"
> +#include "main/macros.h"
> +#include "main/bufferobj.h"
> +
> +#include "brw_context.h"
> +#include "intel_buffer_objects.h"
> +#include "intel_fbo.h"
> +#include "intel_mipmap_tree.h"
> +
> +static GLenum
> +intel_buffer_purgeable(drm_intel_bo *buffer)
> +{
> + int retained = 0;
> +
> + if (buffer != NULL)
> + retained = drm_intel_bo_madvise(buffer, I915_MADV_DONTNEED);
> +
> + return retained ? GL_VOLATILE_APPLE : GL_RELEASED_APPLE;
> +}
> +
> +static GLenum
> +intel_buffer_object_purgeable(struct gl_context * ctx,
> + struct gl_buffer_object *obj,
> + GLenum option)
> +{
> + struct intel_buffer_object *intel_obj = intel_buffer_object(obj);
> +
> + if (intel_obj->buffer != NULL)
> + return intel_buffer_purgeable(intel_obj->buffer);
> +
> + if (option == GL_RELEASED_APPLE) {
> + return GL_RELEASED_APPLE;
> + } else {
> + /* XXX Create the buffer and madvise(MADV_DONTNEED)? */
> + struct brw_context *brw = brw_context(ctx);
> + drm_intel_bo *bo = intel_bufferobj_buffer(brw, intel_obj, INTEL_READ);
> +
> + return intel_buffer_purgeable(bo);
> + }
> +}
> +
> +static GLenum
> +intel_texture_object_purgeable(struct gl_context * ctx,
> + struct gl_texture_object *obj,
> + GLenum option)
> +{
> + struct intel_texture_object *intel;
> +
> + (void) ctx;
> + (void) option;
> +
> + intel = intel_texture_object(obj);
> + if (intel->mt == NULL || intel->mt->region == NULL)
> + return GL_RELEASED_APPLE;
> +
> + return intel_buffer_purgeable(intel->mt->region->bo);
> +}
> +
> +static GLenum
> +intel_render_object_purgeable(struct gl_context * ctx,
> + struct gl_renderbuffer *obj,
> + GLenum option)
> +{
> + struct intel_renderbuffer *intel;
> +
> + (void) ctx;
> + (void) option;
> +
> + intel = intel_renderbuffer(obj);
> + if (intel->mt == NULL)
> + return GL_RELEASED_APPLE;
> +
> + return intel_buffer_purgeable(intel->mt->region->bo);
> +}
> +
> +static GLenum
> +intel_buffer_unpurgeable(drm_intel_bo *buffer)
> +{
> + int retained;
> +
> + retained = 0;
> + if (buffer != NULL)
> + retained = drm_intel_bo_madvise(buffer, I915_MADV_WILLNEED);
> +
> + return retained ? GL_RETAINED_APPLE : GL_UNDEFINED_APPLE;
> +}
> +
> +static GLenum
> +intel_buffer_object_unpurgeable(struct gl_context * ctx,
> + struct gl_buffer_object *obj,
> + GLenum option)
> +{
> + (void) ctx;
> + (void) option;
> +
> + return intel_buffer_unpurgeable(intel_buffer_object(obj)->buffer);
> +}
> +
> +static GLenum
> +intel_texture_object_unpurgeable(struct gl_context * ctx,
> + struct gl_texture_object *obj,
> + GLenum option)
> +{
> + struct intel_texture_object *intel;
> +
> + (void) ctx;
> + (void) option;
> +
> + intel = intel_texture_object(obj);
> + if (intel->mt == NULL || intel->mt->region == NULL)
> + return GL_UNDEFINED_APPLE;
> +
> + return intel_buffer_unpurgeable(intel->mt->region->bo);
> +}
> +
> +static GLenum
> +intel_render_object_unpurgeable(struct gl_context * ctx,
> + struct gl_renderbuffer *obj,
> + GLenum option)
> +{
> + struct intel_renderbuffer *intel;
> +
> + (void) ctx;
> + (void) option;
> +
> + intel = intel_renderbuffer(obj);
> + if (intel->mt == NULL)
> + return GL_UNDEFINED_APPLE;
> +
> + return intel_buffer_unpurgeable(intel->mt->region->bo);
> +}
> +
> +void
> +brw_init_object_purgeable_functions(struct dd_function_table *functions)
Shouldn't this new function be called from somewhere?
> +{
> + functions->BufferObjectPurgeable = intel_buffer_object_purgeable;
> + functions->TextureObjectPurgeable = intel_texture_object_purgeable;
> + functions->RenderObjectPurgeable = intel_render_object_purgeable;
> +
> + functions->BufferObjectUnpurgeable = intel_buffer_object_unpurgeable;
> + functions->TextureObjectUnpurgeable = intel_texture_object_unpurgeable;
> + functions->RenderObjectUnpurgeable = intel_render_object_unpurgeable;
> +}
> diff --git a/src/mesa/drivers/dri/i965/intel_buffer_objects.c b/src/mesa/drivers/dri/i965/intel_buffer_objects.c
> index 0b4782b..740913b 100644
> --- a/src/mesa/drivers/dri/i965/intel_buffer_objects.c
> +++ b/src/mesa/drivers/dri/i965/intel_buffer_objects.c
> @@ -35,11 +35,6 @@
> #include "intel_blit.h"
> #include "intel_buffer_objects.h"
> #include "intel_batchbuffer.h"
> -#include "intel_fbo.h"
> -#include "intel_mipmap_tree.h"
> -#include "intel_regions.h"
> -
> -#include "brw_context.h"
>
> static GLboolean
> intel_bufferobj_unmap(struct gl_context * ctx, struct gl_buffer_object *obj);
> @@ -590,129 +585,6 @@ intel_bufferobj_copy_subdata(struct gl_context *ctx,
> intel_batchbuffer_emit_mi_flush(brw);
> }
>
> -static GLenum
> -intel_buffer_purgeable(drm_intel_bo *buffer)
> -{
> - int retained = 0;
> -
> - if (buffer != NULL)
> - retained = drm_intel_bo_madvise (buffer, I915_MADV_DONTNEED);
> -
> - return retained ? GL_VOLATILE_APPLE : GL_RELEASED_APPLE;
> -}
> -
> -static GLenum
> -intel_buffer_object_purgeable(struct gl_context * ctx,
> - struct gl_buffer_object *obj,
> - GLenum option)
> -{
> - struct intel_buffer_object *intel_obj = intel_buffer_object (obj);
> -
> - if (intel_obj->buffer != NULL)
> - return intel_buffer_purgeable(intel_obj->buffer);
> -
> - if (option == GL_RELEASED_APPLE) {
> - return GL_RELEASED_APPLE;
> - } else {
> - /* XXX Create the buffer and madvise(MADV_DONTNEED)? */
> - struct brw_context *brw = brw_context(ctx);
> - drm_intel_bo *bo = intel_bufferobj_buffer(brw, intel_obj, INTEL_READ);
> -
> - return intel_buffer_purgeable(bo);
> - }
> -}
> -
> -static GLenum
> -intel_texture_object_purgeable(struct gl_context * ctx,
> - struct gl_texture_object *obj,
> - GLenum option)
> -{
> - struct intel_texture_object *intel;
> -
> - (void) ctx;
> - (void) option;
> -
> - intel = intel_texture_object(obj);
> - if (intel->mt == NULL || intel->mt->region == NULL)
> - return GL_RELEASED_APPLE;
> -
> - return intel_buffer_purgeable(intel->mt->region->bo);
> -}
> -
> -static GLenum
> -intel_render_object_purgeable(struct gl_context * ctx,
> - struct gl_renderbuffer *obj,
> - GLenum option)
> -{
> - struct intel_renderbuffer *intel;
> -
> - (void) ctx;
> - (void) option;
> -
> - intel = intel_renderbuffer(obj);
> - if (intel->mt == NULL)
> - return GL_RELEASED_APPLE;
> -
> - return intel_buffer_purgeable(intel->mt->region->bo);
> -}
> -
> -static GLenum
> -intel_buffer_unpurgeable(drm_intel_bo *buffer)
> -{
> - int retained;
> -
> - retained = 0;
> - if (buffer != NULL)
> - retained = drm_intel_bo_madvise (buffer, I915_MADV_WILLNEED);
> -
> - return retained ? GL_RETAINED_APPLE : GL_UNDEFINED_APPLE;
> -}
> -
> -static GLenum
> -intel_buffer_object_unpurgeable(struct gl_context * ctx,
> - struct gl_buffer_object *obj,
> - GLenum option)
> -{
> - (void) ctx;
> - (void) option;
> -
> - return intel_buffer_unpurgeable(intel_buffer_object (obj)->buffer);
> -}
> -
> -static GLenum
> -intel_texture_object_unpurgeable(struct gl_context * ctx,
> - struct gl_texture_object *obj,
> - GLenum option)
> -{
> - struct intel_texture_object *intel;
> -
> - (void) ctx;
> - (void) option;
> -
> - intel = intel_texture_object(obj);
> - if (intel->mt == NULL || intel->mt->region == NULL)
> - return GL_UNDEFINED_APPLE;
> -
> - return intel_buffer_unpurgeable(intel->mt->region->bo);
> -}
> -
> -static GLenum
> -intel_render_object_unpurgeable(struct gl_context * ctx,
> - struct gl_renderbuffer *obj,
> - GLenum option)
> -{
> - struct intel_renderbuffer *intel;
> -
> - (void) ctx;
> - (void) option;
> -
> - intel = intel_renderbuffer(obj);
> - if (intel->mt == NULL)
> - return GL_UNDEFINED_APPLE;
> -
> - return intel_buffer_unpurgeable(intel->mt->region->bo);
> -}
> -
> void
> intelInitBufferObjectFuncs(struct dd_function_table *functions)
> {
> @@ -725,12 +597,4 @@ intelInitBufferObjectFuncs(struct dd_function_table *functions)
> functions->FlushMappedBufferRange = intel_bufferobj_flush_mapped_range;
> functions->UnmapBuffer = intel_bufferobj_unmap;
> functions->CopyBufferSubData = intel_bufferobj_copy_subdata;
> -
> - functions->BufferObjectPurgeable = intel_buffer_object_purgeable;
> - functions->TextureObjectPurgeable = intel_texture_object_purgeable;
> - functions->RenderObjectPurgeable = intel_render_object_purgeable;
> -
> - functions->BufferObjectUnpurgeable = intel_buffer_object_unpurgeable;
> - functions->TextureObjectUnpurgeable = intel_texture_object_unpurgeable;
> - functions->RenderObjectUnpurgeable = intel_render_object_unpurgeable;
> }
>
More information about the mesa-dev
mailing list