OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel-gem: Fix Y-tiling span setup.

Browse Source 
The boolean that the server gives us for whether the region is tiled was
getting used as the enum for what tiling mode.  Instead, guess the correct
tiling in screen setup.

Also, fix the Y-tiling pitch setup.  The pitch to the next tile in Y is
32 scanlines, not 8.
This commit is contained in:
Eric Anholt
2008-07-02 09:10:21 -07:00
parent e74f54793e
commit 19f585a3cf
6 changed files with 52 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/mesa/drivers/dri/intel/intel_fbo.c
View File

@@ -376,7 +376,8 @@ intel_renderbuffer_set_region(struct intel_renderbuffer *rb,
* not a user-created renderbuffer. * not a user-created renderbuffer.
*/ */
struct intel_renderbuffer * struct intel_renderbuffer *
intel_create_renderbuffer(GLenum intFormat, int tiling) intel_create_renderbuffer(intelScreenPrivate *intelScreen,
GLenum intFormat, enum tiling_mode tiling)
{ {
GET_CURRENT_CONTEXT(ctx); GET_CURRENT_CONTEXT(ctx);
@@ -449,8 +450,14 @@ intel_create_renderbuffer(GLenum intFormat, int tiling)
irb->Base.Delete = intel_delete_renderbuffer; irb->Base.Delete = intel_delete_renderbuffer;
irb->Base.AllocStorage = intel_alloc_window_storage; irb->Base.AllocStorage = intel_alloc_window_storage;
irb->Base.GetPointer = intel_get_pointer; irb->Base.GetPointer = intel_get_pointer;
/* This sets the Get/PutRow/Value functions */ /* This sets the Get/PutRow/Value functions. In classic mode, all access
intel_set_span_functions(&irb->Base, tiling); * is through the aperture and will be swizzled by the fence registers, so
* we don't need the span functions to perfom tile swizzling
*/
if (intelScreen->ttm)
intel_set_span_functions(&irb->Base, tiling);
else
intel_set_span_functions(&irb->Base, INTEL_TILE_NONE);
return irb; return irb;
} }

7
src/mesa/drivers/dri/intel/intel_fbo.h
View File

@@ -28,9 +28,9 @@
#ifndef INTEL_FBO_H #ifndef INTEL_FBO_H
#define INTEL_FBO_H #define INTEL_FBO_H
#include "intel_screen.h"
struct intel_context; struct intel_context;
struct intel_region;
/** /**
* Intel framebuffer, derived from gl_framebuffer. * Intel framebuffer, derived from gl_framebuffer.
@@ -72,7 +72,7 @@ struct intel_renderbuffer
struct intel_region *region; struct intel_region *region;
void *pfMap; /* possibly paged flipped map pointer */ void *pfMap; /* possibly paged flipped map pointer */
GLuint pfPitch; /* possibly paged flipped pitch */ GLuint pfPitch; /* possibly paged flipped pitch */
int tiling; enum tiling_mode tiling;
GLboolean RenderToTexture; /* RTT? */ GLboolean RenderToTexture; /* RTT? */
GLuint PairedDepth; /**< only used if this is a depth renderbuffer */ GLuint PairedDepth; /**< only used if this is a depth renderbuffer */
@@ -91,7 +91,8 @@ intel_renderbuffer_set_region(struct intel_renderbuffer *irb,
struct intel_region *region); struct intel_region *region);
extern struct intel_renderbuffer * extern struct intel_renderbuffer *
intel_create_renderbuffer(GLenum intFormat, int tiling); intel_create_renderbuffer(intelScreenPrivate *intelScreen,
GLenum intFormat, enum tiling_mode tiling);
extern void intel_fbo_init(struct intel_context *intel); extern void intel_fbo_init(struct intel_context *intel);

39
src/mesa/drivers/dri/intel/intel_screen.c
View File

@@ -528,6 +528,7 @@ intelCreateBuffer(__DRIscreenPrivate * driScrnPriv,
GLboolean swStencil = (mesaVis->stencilBits > 0 && GLboolean swStencil = (mesaVis->stencilBits > 0 &&
mesaVis->depthBits != 24); mesaVis->depthBits != 24);
GLenum rgbFormat = (mesaVis->redBits == 5 ? GL_RGB5 : GL_RGBA8); GLenum rgbFormat = (mesaVis->redBits == 5 ? GL_RGB5 : GL_RGBA8);
enum tiling_mode tiling;
struct intel_framebuffer *intel_fb = CALLOC_STRUCT(intel_framebuffer); struct intel_framebuffer *intel_fb = CALLOC_STRUCT(intel_framebuffer);
@@ -537,34 +538,46 @@ intelCreateBuffer(__DRIscreenPrivate * driScrnPriv,
_mesa_initialize_framebuffer(&intel_fb->Base, mesaVis); _mesa_initialize_framebuffer(&intel_fb->Base, mesaVis);
/* setup the hardware-based renderbuffers */ /* setup the hardware-based renderbuffers */
/* We get only a boolean value from the DDX for whether tiling is
* enabled, so we have to guess when it's Y and not X (965 depth).
*/
{ {
intel_fb->color_rb[0] = intel_create_renderbuffer(rgbFormat, tiling = screen->front.tiled ? INTEL_TILE_X : INTEL_TILE_NONE;
screen->ttm ? screen->front.tiled : INTEL_TILE_NONE); intel_fb->color_rb[0] = intel_create_renderbuffer(screen,
rgbFormat, tiling);
_mesa_add_renderbuffer(&intel_fb->Base, BUFFER_FRONT_LEFT, _mesa_add_renderbuffer(&intel_fb->Base, BUFFER_FRONT_LEFT,
&intel_fb->color_rb[0]->Base); &intel_fb->color_rb[0]->Base);
} }
if (mesaVis->doubleBufferMode) { if (mesaVis->doubleBufferMode) {
intel_fb->color_rb[1] = intel_create_renderbuffer(rgbFormat, tiling = screen->back.tiled ? INTEL_TILE_X : INTEL_TILE_NONE;
screen->ttm ? screen->back.tiled : INTEL_TILE_NONE); intel_fb->color_rb[1] = intel_create_renderbuffer(screen,
rgbFormat, tiling);
_mesa_add_renderbuffer(&intel_fb->Base, BUFFER_BACK_LEFT, _mesa_add_renderbuffer(&intel_fb->Base, BUFFER_BACK_LEFT,
&intel_fb->color_rb[1]->Base); &intel_fb->color_rb[1]->Base);
if (screen->third.handle) { if (screen->third.handle) {
struct gl_renderbuffer *tmp_rb = NULL; struct gl_renderbuffer *tmp_rb = NULL;
tiling = screen->third.tiled ? INTEL_TILE_X : INTEL_TILE_NONE;
intel_fb->color_rb[2] = intel_create_renderbuffer(rgbFormat, intel_fb->color_rb[2] = intel_create_renderbuffer(screen,
screen->ttm ? screen->third.tiled : INTEL_TILE_NONE); rgbFormat,
tiling);
_mesa_reference_renderbuffer(&tmp_rb, &intel_fb->color_rb[2]->Base); _mesa_reference_renderbuffer(&tmp_rb, &intel_fb->color_rb[2]->Base);
} }
} }
#ifdef I915
tiling = screen->depth.tiled ? INTEL_TILE_X : INTEL_TILE_NONE;
#else
tiling = screen->depth.tiled ? INTEL_TILE_Y : INTEL_TILE_NONE;
#endif
if (mesaVis->depthBits == 24) { if (mesaVis->depthBits == 24) {
if (mesaVis->stencilBits == 8) { if (mesaVis->stencilBits == 8) {
/* combined depth/stencil buffer */ /* combined depth/stencil buffer */
struct intel_renderbuffer *depthStencilRb struct intel_renderbuffer *depthStencilRb
= intel_create_renderbuffer(GL_DEPTH24_STENCIL8_EXT, = intel_create_renderbuffer(screen,
screen->ttm ? screen->depth.tiled : INTEL_TILE_NONE); GL_DEPTH24_STENCIL8_EXT, tiling);
/* note: bind RB to two attachment points */ /* note: bind RB to two attachment points */
_mesa_add_renderbuffer(&intel_fb->Base, BUFFER_DEPTH, _mesa_add_renderbuffer(&intel_fb->Base, BUFFER_DEPTH,
&depthStencilRb->Base); &depthStencilRb->Base);
@@ -572,8 +585,8 @@ intelCreateBuffer(__DRIscreenPrivate * driScrnPriv,
&depthStencilRb->Base); &depthStencilRb->Base);
} else { } else {
struct intel_renderbuffer *depthRb struct intel_renderbuffer *depthRb
= intel_create_renderbuffer(GL_DEPTH_COMPONENT24, = intel_create_renderbuffer(screen,
screen->ttm ? screen->depth.tiled : INTEL_TILE_NONE); GL_DEPTH_COMPONENT24, tiling);
_mesa_add_renderbuffer(&intel_fb->Base, BUFFER_DEPTH, _mesa_add_renderbuffer(&intel_fb->Base, BUFFER_DEPTH,
&depthRb->Base); &depthRb->Base);
} }
@@ -581,8 +594,8 @@ intelCreateBuffer(__DRIscreenPrivate * driScrnPriv,
else if (mesaVis->depthBits == 16) { else if (mesaVis->depthBits == 16) {
/* just 16-bit depth buffer, no hw stencil */ /* just 16-bit depth buffer, no hw stencil */
struct intel_renderbuffer *depthRb struct intel_renderbuffer *depthRb
= intel_create_renderbuffer(GL_DEPTH_COMPONENT16, = intel_create_renderbuffer(screen,
screen->ttm ? screen->depth.tiled : INTEL_TILE_NONE); GL_DEPTH_COMPONENT16, tiling);
_mesa_add_renderbuffer(&intel_fb->Base, BUFFER_DEPTH, &depthRb->Base); _mesa_add_renderbuffer(&intel_fb->Base, BUFFER_DEPTH, &depthRb->Base);
} }

6
src/mesa/drivers/dri/intel/intel_screen.h
View File

@@ -33,6 +33,12 @@
#include "i915_drm.h" #include "i915_drm.h"
#include "xmlconfig.h" #include "xmlconfig.h"
enum tiling_mode {
INTEL_TILE_NONE,
INTEL_TILE_X,
INTEL_TILE_Y
};
/* XXX: change name or eliminate to avoid conflict with "struct /* XXX: change name or eliminate to avoid conflict with "struct
* intel_region"!!! * intel_region"!!!
*/ */

7
src/mesa/drivers/dri/intel/intel_span.c
View File

@@ -168,7 +168,7 @@ static GLubyte *y_tile_swizzle(struct intel_renderbuffer *irb, struct intel_cont
int x_tile_number, y_tile_number; int x_tile_number, y_tile_number;
int tile_off, tile_base; int tile_off, tile_base;
tile_stride = (irb->pfPitch * irb->region->cpp) << 3; tile_stride = (irb->pfPitch * irb->region->cpp) << 5;
x += intel->drawX; x += intel->drawX;
y += intel->drawY; y += intel->drawY;
@@ -181,7 +181,8 @@ static GLubyte *y_tile_swizzle(struct intel_renderbuffer *irb, struct intel_cont
x_tile_number = xbyte >> 7; x_tile_number = xbyte >> 7;
y_tile_number = y >> 5; y_tile_number = y >> 5;
tile_off = ((x_tile_off & ~0xf) << 5) + (y_tile_off << 4) + (x_tile_off & 0xf); tile_off = ((x_tile_off & ~0xf) << 5) + (y_tile_off << 4) +
(x_tile_off & 0xf);
tile_base = (x_tile_number << 12) + y_tile_number * tile_stride; tile_base = (x_tile_number << 12) + y_tile_number * tile_stride;
return buf + tile_base + tile_off; return buf + tile_base + tile_off;
@@ -670,7 +671,7 @@ intelInitSpanFuncs(GLcontext * ctx)
* These are used for the software fallbacks. * These are used for the software fallbacks.
*/ */
void void
intel_set_span_functions(struct gl_renderbuffer *rb, int tiling) intel_set_span_functions(struct gl_renderbuffer *rb, enum tiling_mode tiling)
{ {
if (rb->_ActualFormat == GL_RGB5) { if (rb->_ActualFormat == GL_RGB5) {
/* 565 RGB */ /* 565 RGB */

7
src/mesa/drivers/dri/intel/intel_span.h
View File

@@ -33,10 +33,7 @@ extern void intelInitSpanFuncs(GLcontext * ctx);
extern void intelSpanRenderFinish(GLcontext * ctx); extern void intelSpanRenderFinish(GLcontext * ctx);
extern void intelSpanRenderStart(GLcontext * ctx); extern void intelSpanRenderStart(GLcontext * ctx);
extern void intel_set_span_functions(struct gl_renderbuffer *rb, int tiling); extern void intel_set_span_functions(struct gl_renderbuffer *rb,
enum tiling_mode tiling);
#define INTEL_TILE_NONE 0
#define INTEL_TILE_X 1
#define INTEL_TILE_Y 2
#endif #endif