flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-11 09:56:22 +00:00
Code Issues Releases Wiki Activity

rendercopy: Remove rendercopy.c

Browse Source 
Move scratch_buf_write_to_png() to its only user, gem_render_copy.c.
This makes the cairo dependencies easier to handle from the Android
perspective, but if there is a good reason why this file exists I can
try to handle it differently.

Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Oscar Mateo 2013-11-12 11:50:39 +00:00 committed by Daniel Vetter
parent 37f26d17b1
commit 1cd6913608
4 changed files with 21 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Makefile.sources
View File

@ -28,7 +28,6 @@ libintel_tools_la_SOURCES = \
rendercopy_gen7.c \ rendercopy_gen7.c \
rendercopy_gen8.c \ rendercopy_gen8.c \
rendercopy.h \ rendercopy.h \
rendercopy.c \
intel_reg_map.c \ intel_reg_map.c \
intel_dpio.c \ intel_dpio.c \
intel_iosf.c \ intel_iosf.c \

49
lib/rendercopy.c
View File

@ -1,49 +0,0 @@
/*
* Copyright © 2013 Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*
* Authors:
* Damien Lespiau <damien.lespiau@intel.com>
*/
#include <cairo.h>
#include "rendercopy.h"
void scratch_buf_write_to_png(struct scratch_buf *buf, const char *filename)
{
cairo_surface_t *surface;
cairo_status_t ret;
drm_intel_bo_map(buf->bo, 0);
surface = cairo_image_surface_create_for_data(buf->bo->virtual,
CAIRO_FORMAT_RGB24,
buf_width(buf),
buf_height(buf),
buf->stride);
ret = cairo_surface_write_to_png(surface, filename);
if (ret != CAIRO_STATUS_SUCCESS) {
fprintf(stderr, "%s: %s\n", __func__,
cairo_status_to_string(ret));
}
cairo_surface_destroy(surface);
drm_intel_bo_unmap(buf->bo);
}

2
lib/rendercopy.h
View File

@ -89,6 +89,4 @@ void gen2_render_copyfunc(struct intel_batchbuffer *batch,
unsigned width, unsigned height, unsigned width, unsigned height,
struct scratch_buf *dst, unsigned dst_x, unsigned dst_y); struct scratch_buf *dst, unsigned dst_x, unsigned dst_y);
void scratch_buf_write_to_png(struct scratch_buf *buf, const char *filename);
#endif /* RENDERCOPY_H */ #endif /* RENDERCOPY_H */

21
tests/gem_render_copy.c
View File

@ -31,6 +31,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <unistd.h> #include <unistd.h>
#include <cairo.h>
#include "rendercopy.h" #include "rendercopy.h"
@ -49,6 +50,26 @@ typedef struct {
uint32_t linear[WIDTH * HEIGHT]; uint32_t linear[WIDTH * HEIGHT];
} data_t; } data_t;
static void scratch_buf_write_to_png(struct scratch_buf *buf, const char *filename)
{
cairo_surface_t *surface;
cairo_status_t ret;
drm_intel_bo_map(buf->bo, 0);
surface = cairo_image_surface_create_for_data(buf->bo->virtual,
CAIRO_FORMAT_RGB24,
buf_width(buf),
buf_height(buf),
buf->stride);
ret = cairo_surface_write_to_png(surface, filename);
if (ret != CAIRO_STATUS_SUCCESS) {
fprintf(stderr, "%s: %s\n", __func__,
cairo_status_to_string(ret));
}
cairo_surface_destroy(surface);
drm_intel_bo_unmap(buf->bo);
}
static void scratch_buf_init(data_t *data, struct scratch_buf *buf, static void scratch_buf_init(data_t *data, struct scratch_buf *buf,
int width, int height, int stride, uint32_t color) int width, int height, int stride, uint32_t color)
{ {