flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-24 16:26:13 +00:00
Code Issues Releases Wiki Activity

fix warn in gem_readwrite: 'read/write' shadows a global declaration

Browse Source 
Signed-off-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Imre Deak 2012-10-10 16:04:41 +03:00 committed by Daniel Vetter
parent 9de58cf6c1
commit b614b4d648
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tests/gem_readwrite.c
View File

@ -44,34 +44,34 @@
static int static int
do_read(int fd, int handle, void *buf, int offset, int size) do_read(int fd, int handle, void *buf, int offset, int size)
{ {
struct drm_i915_gem_pread read; struct drm_i915_gem_pread gem_pread;
/* Ensure that we don't have any convenient data in buf in case /* Ensure that we don't have any convenient data in buf in case
* we fail. * we fail.
*/ */
memset(buf, 0xd0, size); memset(buf, 0xd0, size);
memset(&read, 0, sizeof(read)); memset(&gem_pread, 0, sizeof(gem_pread));
read.handle = handle; gem_pread.handle = handle;
read.data_ptr = (uintptr_t)buf; gem_pread.data_ptr = (uintptr_t)buf;
read.size = size; gem_pread.size = size;
read.offset = offset; gem_pread.offset = offset;
return ioctl(fd, DRM_IOCTL_I915_GEM_PREAD, &read); return ioctl(fd, DRM_IOCTL_I915_GEM_PREAD, &gem_pread);
} }
static int static int
do_write(int fd, int handle, void *buf, int offset, int size) do_write(int fd, int handle, void *buf, int offset, int size)
{ {
struct drm_i915_gem_pwrite write; struct drm_i915_gem_pwrite gem_pwrite;
memset(&write, 0, sizeof(write)); memset(&gem_pwrite, 0, sizeof(gem_pwrite));
write.handle = handle; gem_pwrite.handle = handle;
write.data_ptr = (uintptr_t)buf; gem_pwrite.data_ptr = (uintptr_t)buf;
write.size = size; gem_pwrite.size = size;
write.offset = offset; gem_pwrite.offset = offset;
return ioctl(fd, DRM_IOCTL_I915_GEM_PWRITE, &write); return ioctl(fd, DRM_IOCTL_I915_GEM_PWRITE, &gem_pwrite);
} }
int main(int argc, char **argv) int main(int argc, char **argv)