LineageOS/android_hardware_libhardware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

better fix for gralloc on sim

Browse Source
This commit is contained in:
Mathias Agopian
2009-07-07 12:43:35 -07:00
parent d34fd72bfd
commit bfc010a750
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
modules/gralloc/gralloc.cpp
View File

@@ -222,6 +222,8 @@ static int gralloc_alloc_buffer(alloc_device_t* dev,
size = roundUpToPageSize(size); size = roundUpToPageSize(size);
#if HAVE_ANDROID_OS // should probably define HAVE_PMEM somewhere
if (usage & GRALLOC_USAGE_HW_TEXTURE) { if (usage & GRALLOC_USAGE_HW_TEXTURE) {
// enable pmem in that case, so our software GL can fallback to // enable pmem in that case, so our software GL can fallback to
// the copybit module. // the copybit module.
@@ -240,10 +242,6 @@ try_ashmem:
err = -errno; err = -errno;
} }
} else { } else {
#ifndef HAVE_ANDROID_OS // should probably define HAVE_PMEM somewhere
LOGE("pmem not available on this target");
err = -1;
#else
private_module_t* m = reinterpret_cast<private_module_t*>( private_module_t* m = reinterpret_cast<private_module_t*>(
dev->common.module); dev->common.module);
@@ -290,9 +288,18 @@ try_ashmem:
LOGE("couldn't open pmem (%s)", strerror(-errno)); LOGE("couldn't open pmem (%s)", strerror(-errno));
} }
} }
#endif // HAVE_ANDROID_OS
} }
#else // HAVE_ANDROID_OS
fd = ashmem_create_region("Buffer", size);
if (fd < 0) {
LOGE("couldn't create ashmem (%s)", strerror(-errno));
err = -errno;
}
#endif // HAVE_ANDROID_OS
if (err == 0) { if (err == 0) {
private_handle_t* hnd = new private_handle_t(fd, size, flags); private_handle_t* hnd = new private_handle_t(fd, size, flags);
hnd->offset = offset; hnd->offset = offset;
@@ -385,12 +392,9 @@ static int gralloc_free(alloc_device_t* dev,
int index = (hnd->base - m->framebuffer->base) / bufferSize; int index = (hnd->base - m->framebuffer->base) / bufferSize;
m->bufferMask &= ~(1<<index); m->bufferMask &= ~(1<<index);
} }
#if HAVE_ANDROID_OS
else if (hnd->flags & private_handle_t::PRIV_FLAGS_USES_PMEM) else if (hnd->flags & private_handle_t::PRIV_FLAGS_USES_PMEM)
{ {
#ifndef HAVE_ANDROID_OS
LOGE("pmem not available on this target");
return -EINVAL;
#else
if (hnd->fd >= 0) { if (hnd->fd >= 0) {
struct pmem_region sub = { hnd->offset, hnd->size }; struct pmem_region sub = { hnd->offset, hnd->size };
int err = ioctl(hnd->fd, PMEM_UNMAP, &sub); int err = ioctl(hnd->fd, PMEM_UNMAP, &sub);
@@ -404,8 +408,8 @@ static int gralloc_free(alloc_device_t* dev,
sAllocator.deallocate(hnd->offset); sAllocator.deallocate(hnd->offset);
} }
} }
#endif // HAVE_ANDROID_OS
} }
#endif // HAVE_ANDROID_OS
gralloc_module_t* m = reinterpret_cast<gralloc_module_t*>( gralloc_module_t* m = reinterpret_cast<gralloc_module_t*>(
dev->common.module); dev->common.module);