Re: [Mesa-dev] [PATCH 3/3] Revert "i965: add __DRI2_BLOB support and set cache functions"

[Marek Olšák]

For the series:

Reviewed-by: Marek Olšák 

Marek

On Fri, Feb 9, 2018 at 4:59 AM, Timothy Arceri  wrote:
> This reverts commit 9d322fde9781f9fc53c3baac6995ab1cbd8d6135.
> ---
>  src/mesa/drivers/dri/i965/intel_screen.c | 21 -
>  1 file changed, 21 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i965/intel_screen.c 
> b/src/mesa/drivers/dri/i965/intel_screen.c
> index 1f866cf845..8c78b73b64 100644
> --- a/src/mesa/drivers/dri/i965/intel_screen.c
> +++ b/src/mesa/drivers/dri/i965/intel_screen.c
> @@ -36,7 +36,6 @@
>  #include "main/version.h"
>  #include "swrast/s_renderbuffer.h"
>  #include "util/ralloc.h"
> -#include "util/disk_cache.h"
>  #include "brw_defines.h"
>  #include "brw_state.h"
>  #include "compiler/nir/nir.h"
> @@ -1495,19 +1494,6 @@ brw_query_renderer_string(__DRIscreen *dri_screen,
> return -1;
>  }
>
> -static void
> -brw_set_cache_funcs(__DRIscreen *dri_screen,
> -__DRIblobCacheSet set, __DRIblobCacheGet get)
> -{
> -   const struct intel_screen *const screen =
> -  (struct intel_screen *) dri_screen->driverPrivate;
> -
> -   if (!screen->disk_cache)
> -  return;
> -
> -   disk_cache_set_callbacks(screen->disk_cache, set, get);
> -}
> -
>  static const __DRI2rendererQueryExtension intelRendererQueryExtension = {
> .base = { __DRI2_RENDERER_QUERY, 1 },
>
> @@ -1519,11 +1505,6 @@ static const __DRIrobustnessExtension dri2Robustness = 
> {
> .base = { __DRI2_ROBUSTNESS, 1 }
>  };
>
> -static const __DRI2blobExtension intelBlobExtension = {
> -   .base = { __DRI2_BLOB, 1 },
> -   .set_cache_funcs = brw_set_cache_funcs
> -};
> -
>  static const __DRIextension *screenExtensions[] = {
>  ,
>  ,
> @@ -1532,7 +1513,6 @@ static const __DRIextension *screenExtensions[] = {
>  ,
>  ,
>  ,
> -,
>  NULL
>  };
>
> @@ -1545,7 +1525,6 @@ static const __DRIextension 
> *intelRobustScreenExtensions[] = {
>  ,
>  ,
>  ,
> -,
>  NULL
>  };
>
> --
> 2.14.3
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH 3/3] Revert "i965: add __DRI2_BLOB support and set cache functions"

[Timothy Arceri]

This reverts commit 9d322fde9781f9fc53c3baac6995ab1cbd8d6135.
---
 src/mesa/drivers/dri/i965/intel_screen.c | 21 -
 1 file changed, 21 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/intel_screen.c 
b/src/mesa/drivers/dri/i965/intel_screen.c
index 1f866cf845..8c78b73b64 100644
--- a/src/mesa/drivers/dri/i965/intel_screen.c
+++ b/src/mesa/drivers/dri/i965/intel_screen.c
@@ -36,7 +36,6 @@
 #include "main/version.h"
 #include "swrast/s_renderbuffer.h"
 #include "util/ralloc.h"
-#include "util/disk_cache.h"
 #include "brw_defines.h"
 #include "brw_state.h"
 #include "compiler/nir/nir.h"
@@ -1495,19 +1494,6 @@ brw_query_renderer_string(__DRIscreen *dri_screen,
return -1;
 }
 
-static void
-brw_set_cache_funcs(__DRIscreen *dri_screen,
-__DRIblobCacheSet set, __DRIblobCacheGet get)
-{
-   const struct intel_screen *const screen =
-  (struct intel_screen *) dri_screen->driverPrivate;
-
-   if (!screen->disk_cache)
-  return;
-
-   disk_cache_set_callbacks(screen->disk_cache, set, get);
-}
-
 static const __DRI2rendererQueryExtension intelRendererQueryExtension = {
.base = { __DRI2_RENDERER_QUERY, 1 },
 
@@ -1519,11 +1505,6 @@ static const __DRIrobustnessExtension dri2Robustness = {
.base = { __DRI2_ROBUSTNESS, 1 }
 };
 
-static const __DRI2blobExtension intelBlobExtension = {
-   .base = { __DRI2_BLOB, 1 },
-   .set_cache_funcs = brw_set_cache_funcs
-};
-
 static const __DRIextension *screenExtensions[] = {
 ,
 ,
@@ -1532,7 +1513,6 @@ static const __DRIextension *screenExtensions[] = {
 ,
 ,
 ,
-,
 NULL
 };
 
@@ -1545,7 +1525,6 @@ static const __DRIextension 
*intelRobustScreenExtensions[] = {
 ,
 ,
 ,
-,
 NULL
 };
 
-- 
2.14.3

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev