From fbb4353a247157d32208f8f133cd1ee42f4fbc49 Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Mon, 28 Dec 2015 21:54:50 +0100 Subject: Update minuitwrp graphics in line with latest minui Note: events.cpp is still old code renamed to cpp to make it easier to call functions like gr_fb_width(). I had to modify AOSP fbdev code to provide a separate memory surface for drawing to as drawing directly to the framebuffer resulted in rendering taking about 5 times longer. I also modified AOSP adf code to provide a separate memory surface for drawing for the same performance reasons. The Nexus 9 supports adf graphics. Overlay graphics work on at least one device. Overlay provides a separate memory buffer already so performance is good. I do not have a drm device yet that I know of. I made some attempt to update the drm code to determine the correct pixel format based on the drm graphics format, but what is available in pixel flinger and what is available in drm do not line up all that well. Reports are that the Pixel C is using drm graphics, but performance is slow, likely due to the use of a mmap instead of a memory buffyer. Change-Id: Ibd45bccca6ac2cb826037aa9b2aa5065cf683eed --- minuitwrp/graphics_utils.c | 113 --------------------------------------------- 1 file changed, 113 deletions(-) delete mode 100644 minuitwrp/graphics_utils.c (limited to 'minuitwrp/graphics_utils.c') diff --git a/minuitwrp/graphics_utils.c b/minuitwrp/graphics_utils.c deleted file mode 100644 index ea1182dd9..000000000 --- a/minuitwrp/graphics_utils.c +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Copyright (C) 2007 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include -#include -#include - -#include "minui.h" - -struct fb_var_screeninfo vi; -GGLSurface gr_mem_surface; - -int gr_save_screenshot(const char *dest) -{ - uint32_t y, stride_bytes; - volatile int res = -1; - GGLContext *gl = NULL; - GGLSurface surface; - uint8_t * volatile img_data = NULL; - uint8_t *ptr; - FILE * volatile fp = NULL; - png_structp png_ptr = NULL; - png_infop info_ptr = NULL; - - fp = fopen(dest, "wb"); - if(!fp) - goto exit; - - img_data = malloc(gr_mem_surface.stride * vi.yres * 4); - surface.version = sizeof(surface); - surface.width = gr_mem_surface.width; - surface.height = gr_mem_surface.height; - surface.stride = gr_mem_surface.stride; - surface.data = img_data; - surface.format = GGL_PIXEL_FORMAT_RGBA_8888; - - gglInit(&gl); - gl->colorBuffer(gl, &surface); - gl->activeTexture(gl, 0); - - if(gr_mem_surface.format == GGL_PIXEL_FORMAT_RGBX_8888) - gl->disable(gl, GGL_BLEND); - - gl->bindTexture(gl, &gr_mem_surface); - gl->texEnvi(gl, GGL_TEXTURE_ENV, GGL_TEXTURE_ENV_MODE, GGL_REPLACE); - gl->texGeni(gl, GGL_S, GGL_TEXTURE_GEN_MODE, GGL_ONE_TO_ONE); - gl->texGeni(gl, GGL_T, GGL_TEXTURE_GEN_MODE, GGL_ONE_TO_ONE); - gl->enable(gl, GGL_TEXTURE_2D); - gl->texCoord2i(gl, 0, 0); - gl->recti(gl, 0, 0, gr_mem_surface.width, gr_mem_surface.height); - - gglUninit(gl); - gl = NULL; - - png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); - if (!png_ptr) - goto exit; - - info_ptr = png_create_info_struct(png_ptr); - if (info_ptr == NULL) - goto exit; - - if (setjmp(png_jmpbuf(png_ptr))) - goto exit; - - png_init_io(png_ptr, fp); - png_set_IHDR(png_ptr, info_ptr, surface.width, surface.height, - 8, PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE, - PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); - png_write_info(png_ptr, info_ptr); - - // To remove the alpha channel for PNG_COLOR_TYPE_RGB format, - png_set_filler(png_ptr, 0, PNG_FILLER_AFTER); - - ptr = img_data; - stride_bytes = surface.stride*4; - for(y = 0; y < surface.height; ++y) - { - png_write_row(png_ptr, ptr); - ptr += stride_bytes; - } - - png_write_end(png_ptr, NULL); - - res = 0; -exit: - if(info_ptr) - png_free_data(png_ptr, info_ptr, PNG_FREE_ALL, -1); - if(png_ptr) - png_destroy_write_struct(&png_ptr, (png_infopp)NULL); - if(gl) - gglUninit(gl); - if(img_data) - free(img_data); - if(fp) - fclose(fp); - return res; -} -- cgit v1.2.3