diff options
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_context.c | 39 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_context.h | 2 |
2 files changed, 13 insertions, 28 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c index 5625a787b68..ecd0c2ba663 100644 --- a/src/mesa/drivers/dri/intel/intel_context.c +++ b/src/mesa/drivers/dri/intel/intel_context.c @@ -613,31 +613,18 @@ intelInitContext(struct intel_context *intel, intel->driContext = driContextPriv; intel->driFd = sPriv->fd; - intel->has_xrgb_textures = GL_TRUE; intel->gen = intelScreen->gen; - if (IS_GEN7(intel->intelScreen->deviceID)) { - intel->needs_ff_sync = GL_TRUE; - intel->has_luminance_srgb = GL_TRUE; - } else if (IS_GEN6(intel->intelScreen->deviceID)) { - intel->needs_ff_sync = GL_TRUE; - intel->has_luminance_srgb = GL_TRUE; - } else if (IS_GEN5(intel->intelScreen->deviceID)) { - intel->needs_ff_sync = GL_TRUE; - intel->has_luminance_srgb = GL_TRUE; - } else if (IS_965(intel->intelScreen->deviceID)) { - if (IS_G4X(intel->intelScreen->deviceID)) { - intel->has_luminance_srgb = GL_TRUE; - intel->is_g4x = GL_TRUE; - } - } else if (IS_9XX(intel->intelScreen->deviceID)) { - if (IS_945(intel->intelScreen->deviceID)) { - intel->is_945 = GL_TRUE; - } - } else { - if (intel->intelScreen->deviceID == PCI_CHIP_I830_M || - intel->intelScreen->deviceID == PCI_CHIP_845_G) { - intel->has_xrgb_textures = GL_FALSE; - } + + const int devID = intelScreen->deviceID; + + if (IS_G4X(devID)) { + intel->is_g4x = true; + } else if (IS_945(devID)) { + intel->is_945 = true; + } + + if (intel->gen >= 5) { + intel->needs_ff_sync = true; } intel->has_separate_stencil = intel->intelScreen->hw_has_separate_stencil; @@ -647,7 +634,7 @@ intelInitContext(struct intel_context *intel, memset(&ctx->TextureFormatSupported, 0, sizeof(ctx->TextureFormatSupported)); ctx->TextureFormatSupported[MESA_FORMAT_ARGB8888] = GL_TRUE; - if (intel->has_xrgb_textures) + if (devID != PCI_CHIP_I830_M && devID != PCI_CHIP_845_G) ctx->TextureFormatSupported[MESA_FORMAT_XRGB8888] = GL_TRUE; ctx->TextureFormatSupported[MESA_FORMAT_ARGB4444] = GL_TRUE; ctx->TextureFormatSupported[MESA_FORMAT_ARGB1555] = GL_TRUE; @@ -717,7 +704,7 @@ intelInitContext(struct intel_context *intel, ctx->TextureFormatSupported[MESA_FORMAT_SRGBA_DXT1] = GL_TRUE; ctx->TextureFormatSupported[MESA_FORMAT_SRGBA_DXT3] = GL_TRUE; ctx->TextureFormatSupported[MESA_FORMAT_SRGBA_DXT5] = GL_TRUE; - if (intel->has_luminance_srgb) { + if (intel->gen >= 5 || intel->is_g4x) { ctx->TextureFormatSupported[MESA_FORMAT_SL8] = GL_TRUE; ctx->TextureFormatSupported[MESA_FORMAT_SLA8] = GL_TRUE; } diff --git a/src/mesa/drivers/dri/intel/intel_context.h b/src/mesa/drivers/dri/intel/intel_context.h index b7989dd42f5..171814dbfd8 100644 --- a/src/mesa/drivers/dri/intel/intel_context.h +++ b/src/mesa/drivers/dri/intel/intel_context.h @@ -169,8 +169,6 @@ struct intel_context GLboolean needs_ff_sync; GLboolean is_g4x; GLboolean is_945; - GLboolean has_luminance_srgb; - GLboolean has_xrgb_textures; GLboolean has_separate_stencil; GLboolean must_use_separate_stencil; GLboolean has_hiz; |