i915: Delete swizzling detection logic.
This is all leftover from the i965 split. Reviewed-by: Jason Ekstrand <jason@jlekstrand.net> Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
This commit is contained in:
parent
beb66d3747
commit
c2e3d0f163
|
@ -442,8 +442,6 @@ intelInitContext(struct intel_context *intel,
|
||||||
|
|
||||||
intel->is_945 = IS_945(devID);
|
intel->is_945 = IS_945(devID);
|
||||||
|
|
||||||
intel->has_swizzling = intel->intelScreen->hw_has_swizzling;
|
|
||||||
|
|
||||||
memset(&ctx->TextureFormatSupported,
|
memset(&ctx->TextureFormatSupported,
|
||||||
0, sizeof(ctx->TextureFormatSupported));
|
0, sizeof(ctx->TextureFormatSupported));
|
||||||
|
|
||||||
|
|
|
@ -159,7 +159,6 @@ struct intel_context
|
||||||
*/
|
*/
|
||||||
int gen;
|
int gen;
|
||||||
bool is_945;
|
bool is_945;
|
||||||
bool has_swizzling;
|
|
||||||
|
|
||||||
struct intel_batchbuffer batch;
|
struct intel_batchbuffer batch;
|
||||||
|
|
||||||
|
|
|
@ -1020,30 +1020,6 @@ intel_init_bufmgr(struct intel_screen *intelScreen)
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool
|
|
||||||
intel_detect_swizzling(struct intel_screen *screen)
|
|
||||||
{
|
|
||||||
drm_intel_bo *buffer;
|
|
||||||
unsigned long flags = 0;
|
|
||||||
unsigned long aligned_pitch;
|
|
||||||
uint32_t tiling = I915_TILING_X;
|
|
||||||
uint32_t swizzle_mode = 0;
|
|
||||||
|
|
||||||
buffer = drm_intel_bo_alloc_tiled(screen->bufmgr, "swizzle test",
|
|
||||||
64, 64, 4,
|
|
||||||
&tiling, &aligned_pitch, flags);
|
|
||||||
if (buffer == NULL)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
drm_intel_bo_get_tiling(buffer, &tiling, &swizzle_mode);
|
|
||||||
drm_intel_bo_unreference(buffer);
|
|
||||||
|
|
||||||
if (swizzle_mode == I915_BIT_6_SWIZZLE_NONE)
|
|
||||||
return false;
|
|
||||||
else
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
static __DRIconfig**
|
static __DRIconfig**
|
||||||
intel_screen_make_configs(__DRIscreen *dri_screen)
|
intel_screen_make_configs(__DRIscreen *dri_screen)
|
||||||
{
|
{
|
||||||
|
@ -1200,8 +1176,6 @@ __DRIconfig **intelInitScreen2(__DRIscreen *psp)
|
||||||
intelScreen->gen = 2;
|
intelScreen->gen = 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
intelScreen->hw_has_swizzling = intel_detect_swizzling(intelScreen);
|
|
||||||
|
|
||||||
set_max_gl_versions(intelScreen);
|
set_max_gl_versions(intelScreen);
|
||||||
|
|
||||||
psp->extensions = intelScreenExtensions;
|
psp->extensions = intelScreenExtensions;
|
||||||
|
|
|
@ -44,8 +44,6 @@ struct intel_screen
|
||||||
|
|
||||||
bool no_hw;
|
bool no_hw;
|
||||||
|
|
||||||
bool hw_has_swizzling;
|
|
||||||
|
|
||||||
bool no_vbo;
|
bool no_vbo;
|
||||||
dri_bufmgr *bufmgr;
|
dri_bufmgr *bufmgr;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue