From: Eric Anholt Date: Tue, 29 Apr 2014 22:30:15 +0000 (-0700) Subject: i965: Rename intel_regions.h to something more appropriate now. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5566747296f6a0b9dcadd056b0a9743c0fbce147;p=mesa.git i965: Rename intel_regions.h to something more appropriate now. We had the EGLimage structure laying around in intel_regions.h, but now it's the only thing left in the file. Reviewed-by: Kenneth Graunke Reviewed-by: Chad Versace --- diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index 8ffacc8f1a5..449fcfc4789 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -57,7 +57,7 @@ #include "intel_fbo.h" #include "intel_mipmap_tree.h" #include "intel_pixel.h" -#include "intel_regions.h" +#include "intel_image.h" #include "intel_tex.h" #include "intel_tex_obj.h" diff --git a/src/mesa/drivers/dri/i965/intel_fbo.c b/src/mesa/drivers/dri/i965/intel_fbo.c index 477e126eebf..e820a14d123 100644 --- a/src/mesa/drivers/dri/i965/intel_fbo.c +++ b/src/mesa/drivers/dri/i965/intel_fbo.c @@ -48,7 +48,7 @@ #include "intel_blit.h" #include "intel_fbo.h" #include "intel_mipmap_tree.h" -#include "intel_regions.h" +#include "intel_image.h" #include "intel_screen.h" #include "intel_tex.h" #include "brw_context.h" diff --git a/src/mesa/drivers/dri/i965/intel_image.h b/src/mesa/drivers/dri/i965/intel_image.h new file mode 100644 index 00000000000..ba3ed27066c --- /dev/null +++ b/src/mesa/drivers/dri/i965/intel_image.h @@ -0,0 +1,109 @@ +/************************************************************************** + * + * Copyright 2006 VMware, Inc. + * All Rights Reserved. + * + * 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, sub license, 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 NON-INFRINGEMENT. + * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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. + * + **************************************************************************/ + +#ifndef INTEL_REGIONS_H +#define INTEL_REGIONS_H + +/** @file intel_image.h + * + * Structure definitions and prototypes for intel_region handling, + * which is the basic structure for rectangular collections of pixels + * stored in a drm_intel_bo. + */ + +#include +#include + +#include "main/mtypes.h" +#include "intel_bufmgr.h" +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * Used with images created with image_from_names + * to help support planar images. + */ +struct intel_image_format { + int fourcc; + int components; + int nplanes; + struct { + int buffer_index; + int width_shift; + int height_shift; + uint32_t dri_format; + int cpp; + } planes[3]; +}; + +struct __DRIimageRec { + drm_intel_bo *bo; + uint32_t pitch; /**< in bytes */ + GLenum internal_format; + uint32_t dri_format; + GLuint format; + uint32_t offset; + + /* + * Need to save these here between calls to + * image_from_names and calls to image_from_planar. + */ + uint32_t strides[3]; + uint32_t offsets[3]; + struct intel_image_format *planar_format; + + /* particular miptree level */ + GLuint width; + GLuint height; + GLuint tile_x; + GLuint tile_y; + bool has_depthstencil; + + /** + * Provided by EGL_EXT_image_dma_buf_import. + * + * The flag is set in order to restrict the use of the image later on. + * + * See intel_image_target_texture_2d() + */ + bool dma_buf_imported; + enum __DRIYUVColorSpace yuv_color_space; + enum __DRISampleRange sample_range; + enum __DRIChromaSiting horizontal_siting; + enum __DRIChromaSiting vertical_siting; + + void *data; +}; + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c b/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c index 1d9193a739b..1b3f952f4fb 100644 --- a/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c +++ b/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c @@ -47,7 +47,7 @@ #include "intel_batchbuffer.h" #include "intel_blit.h" #include "intel_fbo.h" -#include "intel_regions.h" +#include "intel_image.h" #include "intel_buffers.h" #include "intel_pixel.h" #include "intel_reg.h" diff --git a/src/mesa/drivers/dri/i965/intel_regions.h b/src/mesa/drivers/dri/i965/intel_regions.h deleted file mode 100644 index a34f0b0e3f8..00000000000 --- a/src/mesa/drivers/dri/i965/intel_regions.h +++ /dev/null @@ -1,109 +0,0 @@ -/************************************************************************** - * - * Copyright 2006 VMware, Inc. - * All Rights Reserved. - * - * 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, sub license, 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 NON-INFRINGEMENT. - * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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. - * - **************************************************************************/ - -#ifndef INTEL_REGIONS_H -#define INTEL_REGIONS_H - -/** @file intel_regions.h - * - * Structure definitions and prototypes for intel_region handling, - * which is the basic structure for rectangular collections of pixels - * stored in a drm_intel_bo. - */ - -#include -#include - -#include "main/mtypes.h" -#include "intel_bufmgr.h" -#include - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * Used with images created with image_from_names - * to help support planar images. - */ -struct intel_image_format { - int fourcc; - int components; - int nplanes; - struct { - int buffer_index; - int width_shift; - int height_shift; - uint32_t dri_format; - int cpp; - } planes[3]; -}; - -struct __DRIimageRec { - drm_intel_bo *bo; - uint32_t pitch; /**< in bytes */ - GLenum internal_format; - uint32_t dri_format; - GLuint format; - uint32_t offset; - - /* - * Need to save these here between calls to - * image_from_names and calls to image_from_planar. - */ - uint32_t strides[3]; - uint32_t offsets[3]; - struct intel_image_format *planar_format; - - /* particular miptree level */ - GLuint width; - GLuint height; - GLuint tile_x; - GLuint tile_y; - bool has_depthstencil; - - /** - * Provided by EGL_EXT_image_dma_buf_import. - * - * The flag is set in order to restrict the use of the image later on. - * - * See intel_image_target_texture_2d() - */ - bool dma_buf_imported; - enum __DRIYUVColorSpace yuv_color_space; - enum __DRISampleRange sample_range; - enum __DRIChromaSiting horizontal_siting; - enum __DRIChromaSiting vertical_siting; - - void *data; -}; - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index f7394ae2950..8299d3d16d4 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -100,7 +100,7 @@ DRI_CONF_END #include "intel_mipmap_tree.h" #include "intel_screen.h" #include "intel_tex.h" -#include "intel_regions.h" +#include "intel_image.h" #include "brw_context.h" diff --git a/src/mesa/drivers/dri/i965/intel_tex_image.c b/src/mesa/drivers/dri/i965/intel_tex_image.c index 42fdee32a32..fbb799bc62a 100644 --- a/src/mesa/drivers/dri/i965/intel_tex_image.c +++ b/src/mesa/drivers/dri/i965/intel_tex_image.c @@ -21,7 +21,7 @@ #include "intel_tex.h" #include "intel_blit.h" #include "intel_fbo.h" -#include "intel_regions.h" +#include "intel_image.h" #include "brw_context.h"