diff options
| author | Zack Rusin <zackr@vmware.com> | 2010-03-30 21:10:33 -0400 |
|---|---|---|
| committer | Zack Rusin <zackr@vmware.com> | 2010-03-30 21:10:33 -0400 |
| commit | 880e3fb09b538f6f0b6fad2db7e0e10e9df43555 (patch) | |
| tree | e6cc8c691974e679ead73c3731c49a874019c8ba /src/mesa/drivers/dri/intel/intel_regions.h | |
| parent | 93e342574f5fc95789028dbe7cf637257562e9bb (diff) | |
| parent | 4afed821baa6993d85a07c67d42ea40d4e9a600a (diff) | |
Merge remote branch 'origin/master' into gallium_draw_llvm
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_regions.h')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_regions.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_regions.h b/src/mesa/drivers/dri/intel/intel_regions.h index 7ee6a988ea..2459c9a924 100644 --- a/src/mesa/drivers/dri/intel/intel_regions.h +++ b/src/mesa/drivers/dri/intel/intel_regions.h @@ -65,7 +65,6 @@ struct intel_region GLuint draw_x, draw_y; /**< Offset of drawing within the region */ uint32_t tiling; /**< Which tiling mode the region is in */ - uint32_t bit_6_swizzle; /**< GEM flag for address swizzling requirement */ struct intel_buffer_object *pbo; /* zero-copy uploads */ uint32_t name; /**< Global name for the bo */ @@ -79,7 +78,7 @@ struct intel_region struct intel_region *intel_region_alloc(struct intel_context *intel, uint32_t tiling, GLuint cpp, GLuint width, - GLuint height, GLuint pitch, + GLuint height, GLboolean expect_accelerated_upload); struct intel_region * @@ -122,6 +121,7 @@ intel_region_copy(struct intel_context *intel, struct intel_region *src, GLuint src_offset, GLuint srcx, GLuint srcy, GLuint width, GLuint height, + GLboolean flip, GLenum logicop); /* Helpers for zerocopy uploads, particularly texture image uploads: |