On 08/08/2012 10:38 AM, Ian Romanick wrote:
> From: Ian Romanick <ian.d.roman...@intel.com>
>
> In the i965 dirver, the chipset must be i965.
>
> Signed-off-by: Ian Romanick <ian.d.roman...@intel.com>
> ---
> src/mesa/drivers/dri/intel/intel_screen.c | 13 +++++--------
> 1 files changed, 5 insertions(+), 8 deletions(-)
What you're asserting here is that the loader will only ever try to load
i915_dri.so on a pre-965 PCI ID, and only try to load i965_dri.so on a
965+ PCI ID.
If that's the case, then yes, kill this code. Otherwise, it's
absolutely necessary. I haven't trekked through the loader code to know
one way or another.
> diff --git a/src/mesa/drivers/dri/intel/intel_screen.c
> b/src/mesa/drivers/dri/intel/intel_screen.c
> index e541c7f..54ad112 100644
> --- a/src/mesa/drivers/dri/intel/intel_screen.c
> +++ b/src/mesa/drivers/dri/intel/intel_screen.c
> @@ -720,20 +720,17 @@ intelCreateContext(gl_api api,
>
> #ifdef I915
> if (IS_9XX(intelScreen->deviceID)) {
> - if (!IS_965(intelScreen->deviceID)) {
> - success = i915CreateContext(api, mesaVis, driContextPriv,
> - sharedContextPrivate);
> - }
> + success = i915CreateContext(api, mesaVis, driContextPriv,
> + sharedContextPrivate);
> } else {
> intelScreen->no_vbo = true;
> success = i830CreateContext(mesaVis, driContextPriv,
> sharedContextPrivate);
> }
> #else
> - if (IS_965(intelScreen->deviceID))
> - success = brwCreateContext(api, mesaVis,
> - driContextPriv,
> - sharedContextPrivate);
> + success = brwCreateContext(api, mesaVis,
> + driContextPriv,
> + sharedContextPrivate);
> #endif
>
> if (success) {
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
