Mesa (master): meta: Put _mesa_meta_in_progress in the header file
Kenneth Graunke
kwg at kemper.freedesktop.org
Thu Jan 15 02:16:03 UTC 2015
Module: Mesa
Branch: master
Commit: 3f1f1d0df460b719f7569b679083a07b9fb8e706
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3f1f1d0df460b719f7569b679083a07b9fb8e706
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Tue Nov 11 14:14:14 2014 +0000
meta: Put _mesa_meta_in_progress in the header file
...so that it can be inlined in the two places that call it.
On Bay Trail-D using Fedora 20 compile flags (-m64 -O2 -mtune=generic
for 64-bit and -m32 -march=i686 -mtune=atom for 32-bit), affects
Gl32Batch7:
32-bit: No difference proven at 95.0% confidence (n=120)
64-bit: Difference at 95.0% confidence 1.24042% +/- 0.382277% (n=40)
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
---
src/mesa/drivers/common/meta.c | 10 ----------
src/mesa/drivers/common/meta.h | 7 +++++--
2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index 9c9f72d..23c05eb 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -1213,16 +1213,6 @@ _mesa_meta_end(struct gl_context *ctx)
/**
- * Determine whether Mesa is currently in a meta state.
- */
-GLboolean
-_mesa_meta_in_progress(struct gl_context *ctx)
-{
- return ctx->Meta->SaveStackDepth != 0;
-}
-
-
-/**
* Convert Z from a normalized value in the range [0, 1] to an object-space
* Z coordinate in [-1, +1] so that drawing at the new Z position with the
* default/identity ortho projection results in the original Z value.
diff --git a/src/mesa/drivers/common/meta.h b/src/mesa/drivers/common/meta.h
index 6ecf3c0..c6aef01 100644
--- a/src/mesa/drivers/common/meta.h
+++ b/src/mesa/drivers/common/meta.h
@@ -446,8 +446,11 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state);
extern void
_mesa_meta_end(struct gl_context *ctx);
-extern GLboolean
-_mesa_meta_in_progress(struct gl_context *ctx);
+static inline bool
+_mesa_meta_in_progress(struct gl_context *ctx)
+{
+ return ctx->Meta->SaveStackDepth != 0;
+}
extern void
_mesa_meta_fb_tex_blit_begin(const struct gl_context *ctx,
More information about the mesa-commit
mailing list