Mesa (master): intel: Make intel_region_map return void *.
Eric Anholt
anholt at kemper.freedesktop.org
Wed Dec 7 22:32:49 UTC 2011
Module: Mesa
Branch: master
Commit: 4cb1d6a25e4749ec5e0389ca3da468adbbe5299e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4cb1d6a25e4749ec5e0389ca3da468adbbe5299e
Author: Eric Anholt <eric at anholt.net>
Date: Wed Nov 30 06:47:27 2011 -0800
intel: Make intel_region_map return void *.
We don't gripe about void * arithmetic for our driver, and this
prevents silly casting when assigning the result of mapping to
non-byte types.
Reviewed-by: Chad Versace <chad.versace at linux.intel.com>
---
src/mesa/drivers/dri/intel/intel_regions.c | 2 +-
src/mesa/drivers/dri/intel/intel_regions.h | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/mesa/drivers/dri/intel/intel_regions.c b/src/mesa/drivers/dri/intel/intel_regions.c
index 0b9ffe8..bc83649 100644
--- a/src/mesa/drivers/dri/intel/intel_regions.c
+++ b/src/mesa/drivers/dri/intel/intel_regions.c
@@ -108,7 +108,7 @@ debug_backtrace(void)
/* XXX: Thread safety?
*/
-GLubyte *
+void *
intel_region_map(struct intel_context *intel, struct intel_region *region,
GLbitfield mode)
{
diff --git a/src/mesa/drivers/dri/intel/intel_regions.h b/src/mesa/drivers/dri/intel/intel_regions.h
index 06e76ac..8c7e138 100644
--- a/src/mesa/drivers/dri/intel/intel_regions.h
+++ b/src/mesa/drivers/dri/intel/intel_regions.h
@@ -100,9 +100,9 @@ void intel_recreate_static_regions(struct intel_context *intel);
*
* \param mode bitmask of GL_MAP_READ_BIT, GL_MAP_WRITE_BIT
*/
-GLubyte *intel_region_map(struct intel_context *intel,
- struct intel_region *ib,
- GLbitfield mode);
+void *intel_region_map(struct intel_context *intel,
+ struct intel_region *ib,
+ GLbitfield mode);
void intel_region_unmap(struct intel_context *intel, struct intel_region *ib);
More information about the mesa-commit
mailing list