Mesa (master): intel: Drop intelFlush()
Kristian Høgsberg
krh at kemper.freedesktop.org
Mon May 10 21:49:19 UTC 2010
Module: Mesa
Branch: master
Commit: c4775a27e3aaa2006b98f225387499b79bc609ef
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c4775a27e3aaa2006b98f225387499b79bc609ef
Author: Kristian Høgsberg <krh at bitplanet.net>
Date: Mon May 10 17:42:43 2010 -0400
intel: Drop intelFlush()
Now that intel_flush() deosn't use the needs_mi_flush argument, we can
finally drop one of the two flush functions.
---
src/mesa/drivers/dri/intel/intel_buffer_objects.c | 4 ++--
src/mesa/drivers/dri/intel/intel_context.c | 14 ++++----------
src/mesa/drivers/dri/intel/intel_context.h | 3 +--
src/mesa/drivers/dri/intel/intel_fbo.c | 4 ++--
src/mesa/drivers/dri/intel/intel_pixel_copy.c | 2 +-
src/mesa/drivers/dri/intel/intel_pixel_read.c | 2 +-
src/mesa/drivers/dri/intel/intel_regions.c | 2 +-
src/mesa/drivers/dri/intel/intel_span.c | 2 +-
src/mesa/drivers/dri/intel/intel_syncobj.c | 2 +-
src/mesa/drivers/dri/intel/intel_tex_copy.c | 2 +-
src/mesa/drivers/dri/intel/intel_tex_image.c | 6 +++---
src/mesa/drivers/dri/intel/intel_tex_subimage.c | 2 +-
12 files changed, 19 insertions(+), 26 deletions(-)
diff --git a/src/mesa/drivers/dri/intel/intel_buffer_objects.c b/src/mesa/drivers/dri/intel/intel_buffer_objects.c
index 103aaf2..c38551b 100644
--- a/src/mesa/drivers/dri/intel/intel_buffer_objects.c
+++ b/src/mesa/drivers/dri/intel/intel_buffer_objects.c
@@ -277,7 +277,7 @@ intel_bufferobj_map(GLcontext * ctx,
/* Flush any existing batchbuffer that might reference this data. */
if (drm_intel_bo_references(intel->batch->buf, intel_obj->buffer))
- intelFlush(ctx);
+ intel_flush(ctx);
if (intel_obj->region)
intel_bufferobj_cow(intel, intel_obj);
@@ -349,7 +349,7 @@ intel_bufferobj_map_range(GLcontext * ctx,
*/
if (!(access & GL_MAP_UNSYNCHRONIZED_BIT) &&
drm_intel_bo_references(intel->batch->buf, intel_obj->buffer))
- intelFlush(ctx);
+ intel_flush(ctx);
if (intel_obj->buffer == NULL) {
obj->Pointer = NULL;
diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
index c34ebb0..4612a3a 100644
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -228,7 +228,7 @@ intel_update_renderbuffers(__DRIcontext *context, __DRIdrawable *drawable)
* buffer.
*/
if (intel->is_front_buffer_rendering) {
- intel_flush(&intel->ctx, GL_FALSE);
+ intel_flush(&intel->ctx);
intel_flush_front(&intel->ctx);
}
@@ -502,7 +502,7 @@ intelInvalidateState(GLcontext * ctx, GLuint new_state)
}
void
-intel_flush(GLcontext *ctx, GLboolean needs_mi_flush)
+intel_flush(GLcontext *ctx)
{
struct intel_context *intel = intel_context(ctx);
@@ -516,18 +516,12 @@ intel_flush(GLcontext *ctx, GLboolean needs_mi_flush)
intel_batchbuffer_flush(intel->batch);
}
-void
-intelFlush(GLcontext * ctx)
-{
- intel_flush(ctx, GL_FALSE);
-}
-
static void
intel_glFlush(GLcontext *ctx)
{
struct intel_context *intel = intel_context(ctx);
- intel_flush(ctx, GL_TRUE);
+ intel_flush(ctx);
intel_flush_front(ctx);
@@ -557,7 +551,7 @@ intelFinish(GLcontext * ctx)
struct gl_framebuffer *fb = ctx->DrawBuffer;
int i;
- intelFlush(ctx);
+ intel_flush(ctx);
for (i = 0; i < fb->_NumColorDrawBuffers; i++) {
struct intel_renderbuffer *irb;
diff --git a/src/mesa/drivers/dri/intel/intel_context.h b/src/mesa/drivers/dri/intel/intel_context.h
index 02bb4d0..7bc5aa5 100644
--- a/src/mesa/drivers/dri/intel/intel_context.h
+++ b/src/mesa/drivers/dri/intel/intel_context.h
@@ -371,8 +371,7 @@ extern GLboolean intelInitContext(struct intel_context *intel,
struct dd_function_table *functions);
extern void intelFinish(GLcontext * ctx);
-extern void intelFlush(GLcontext * ctx);
-extern void intel_flush(GLcontext * ctx, GLboolean needs_mi_flush);
+extern void intel_flush(GLcontext * ctx);
extern void intelInitDriverFunctions(struct dd_function_table *functions);
diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c b/src/mesa/drivers/dri/intel/intel_fbo.c
index 7162c9f..217be7e 100644
--- a/src/mesa/drivers/dri/intel/intel_fbo.c
+++ b/src/mesa/drivers/dri/intel/intel_fbo.c
@@ -168,7 +168,7 @@ intel_alloc_renderbuffer_storage(GLcontext * ctx, struct gl_renderbuffer *rb,
rb->_BaseFormat = _mesa_base_fbo_format(ctx, internalFormat);
cpp = _mesa_get_format_bytes(rb->Format);
- intelFlush(ctx);
+ intel_flush(ctx);
/* free old region */
if (irb->region) {
@@ -420,7 +420,7 @@ intel_framebuffer_renderbuffer(GLcontext * ctx,
{
DBG("Intel FramebufferRenderbuffer %u %u\n", fb->Name, rb ? rb->Name : 0);
- intelFlush(ctx);
+ intel_flush(ctx);
_mesa_framebuffer_renderbuffer(ctx, fb, attachment, rb);
intel_draw_buffer(ctx, fb);
diff --git a/src/mesa/drivers/dri/intel/intel_pixel_copy.c b/src/mesa/drivers/dri/intel/intel_pixel_copy.c
index 56faf07..2008a4c 100644
--- a/src/mesa/drivers/dri/intel/intel_pixel_copy.c
+++ b/src/mesa/drivers/dri/intel/intel_pixel_copy.c
@@ -142,7 +142,7 @@ do_blit_copypixels(GLcontext * ctx,
if (!src || !dst)
return GL_FALSE;
- intelFlush(&intel->ctx);
+ intel_flush(&intel->ctx);
/* Clip to destination buffer. */
orig_dstx = dstx;
diff --git a/src/mesa/drivers/dri/intel/intel_pixel_read.c b/src/mesa/drivers/dri/intel/intel_pixel_read.c
index 0c95a97..21d2a7a 100644
--- a/src/mesa/drivers/dri/intel/intel_pixel_read.c
+++ b/src/mesa/drivers/dri/intel/intel_pixel_read.c
@@ -176,7 +176,7 @@ intelReadPixels(GLcontext * ctx,
if (INTEL_DEBUG & DEBUG_PIXEL)
fprintf(stderr, "%s\n", __FUNCTION__);
- intelFlush(ctx);
+ intel_flush(ctx);
/* glReadPixels() wont dirty the front buffer, so reset the dirty
* flag after calling intel_prepare_render(). */
diff --git a/src/mesa/drivers/dri/intel/intel_regions.c b/src/mesa/drivers/dri/intel/intel_regions.c
index 1172de9..8cdeaf6 100644
--- a/src/mesa/drivers/dri/intel/intel_regions.c
+++ b/src/mesa/drivers/dri/intel/intel_regions.c
@@ -111,7 +111,7 @@ debug_backtrace(void)
GLubyte *
intel_region_map(struct intel_context *intel, struct intel_region *region)
{
- intelFlush(&intel->ctx);
+ intel_flush(&intel->ctx);
_DBG("%s %p\n", __FUNCTION__, region);
if (!region->map_refcount++) {
diff --git a/src/mesa/drivers/dri/intel/intel_span.c b/src/mesa/drivers/dri/intel/intel_span.c
index c1e15d1..059f76f 100644
--- a/src/mesa/drivers/dri/intel/intel_span.c
+++ b/src/mesa/drivers/dri/intel/intel_span.c
@@ -244,7 +244,7 @@ intelSpanRenderStart(GLcontext * ctx)
struct intel_context *intel = intel_context(ctx);
GLuint i;
- intelFlush(&intel->ctx);
+ intel_flush(&intel->ctx);
intel_prepare_render(intel);
for (i = 0; i < ctx->Const.MaxTextureImageUnits; i++) {
diff --git a/src/mesa/drivers/dri/intel/intel_syncobj.c b/src/mesa/drivers/dri/intel/intel_syncobj.c
index d67f0cb..c2d8643 100644
--- a/src/mesa/drivers/dri/intel/intel_syncobj.c
+++ b/src/mesa/drivers/dri/intel/intel_syncobj.c
@@ -77,7 +77,7 @@ intel_fence_sync(GLcontext *ctx, struct gl_sync_object *s,
sync->bo = intel->batch->buf;
drm_intel_bo_reference(sync->bo);
- intelFlush(ctx);
+ intel_flush(ctx);
}
/* We ignore the user-supplied timeout. This is weaselly -- we're allowed to
diff --git a/src/mesa/drivers/dri/intel/intel_tex_copy.c b/src/mesa/drivers/dri/intel/intel_tex_copy.c
index 62e1e78..549a4ac 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_copy.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_copy.c
@@ -108,7 +108,7 @@ do_copy_texsubimage(struct intel_context *intel,
return GL_FALSE;
}
- /* intelFlush(ctx); */
+ /* intel_flush(ctx); */
intel_prepare_render(intel);
{
drm_intel_bo *dst_bo = intel_region_buffer(intel,
diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c b/src/mesa/drivers/dri/intel/intel_tex_image.c
index a0e734b..136fda2 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_image.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_image.c
@@ -239,7 +239,7 @@ try_pbo_upload(struct intel_context *intel,
dst_stride = intelImage->mt->region->pitch;
if (drm_intel_bo_references(intel->batch->buf, dst_buffer))
- intelFlush(&intel->ctx);
+ intel_flush(&intel->ctx);
intel_prepare_render(intel);
{
dri_bo *src_buffer = intel_bufferobj_buffer(intel, pbo, INTEL_READ);
@@ -480,7 +480,7 @@ intelTexImage(GLcontext * ctx,
/* Flush any queued rendering with the texture before mapping. */
if (drm_intel_bo_references(intel->batch->buf,
intelImage->mt->region->buffer)) {
- intelFlush(ctx);
+ intel_flush(ctx);
}
texImage->Data = intel_miptree_image_map(intel,
intelImage->mt,
@@ -638,7 +638,7 @@ intel_get_tex_image(GLcontext * ctx, GLenum target, GLint level,
* make sure rendering is complete.
* We could probably predicate this on texObj->_RenderToTexture
*/
- intelFlush(ctx);
+ intel_flush(ctx);
/* Map */
if (intelImage->mt) {
diff --git a/src/mesa/drivers/dri/intel/intel_tex_subimage.c b/src/mesa/drivers/dri/intel/intel_tex_subimage.c
index c35d2e8..4f5c26a 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_subimage.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_subimage.c
@@ -59,7 +59,7 @@ intelTexSubimage(GLcontext * ctx,
_mesa_lookup_enum_by_nr(target),
level, xoffset, yoffset, width, height);
- intelFlush(ctx);
+ intel_flush(ctx);
if (compressed)
pixels = _mesa_validate_pbo_compressed_teximage(ctx, imageSize,
More information about the mesa-commit
mailing list