[Mesa-dev] [PATCH 01/13] mesa/meta: Don't free meta if it was never initialized

2015-05-05 Thread Juha-Pekka Heikkila 
Signed-off-by: Juha-Pekka Heikkila juhapekka.heikk...@gmail.com
---
 src/mesa/drivers/common/meta.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index d2ab7b8..b2cb0d5 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -407,6 +407,9 @@ void
 _mesa_meta_free(struct gl_context *ctx)
 {
GET_CURRENT_CONTEXT(old_context);
+   if (!ctx-Meta)
+  return;
+
_mesa_make_current(ctx, NULL, NULL);
_mesa_meta_glsl_blit_cleanup(ctx-Meta-Blit);
meta_glsl_clear_cleanup(ctx-Meta-Clear);
-- 
1.8.5.1

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

[Mesa-dev] [PATCH 01/13] mesa/meta: Don't free meta if it was never initialized

2014-12-02 Thread Juha-Pekka Heikkila 
Signed-off-by: Juha-Pekka Heikkila juhapekka.heikk...@gmail.com
---
 src/mesa/drivers/common/meta.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index 87532c1..e106899 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -404,6 +404,9 @@ void
 _mesa_meta_free(struct gl_context *ctx)
 {
GET_CURRENT_CONTEXT(old_context);
+   if (!ctx-Meta)
+  return;
+
_mesa_make_current(ctx, NULL, NULL);
_mesa_meta_glsl_blit_cleanup(ctx-Meta-Blit);
meta_glsl_clear_cleanup(ctx-Meta-Clear);
-- 
1.8.5.1

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

Re: [Mesa-dev] [PATCH 01/13] mesa/meta: Don't free meta if it was never initialized

2014-12-01 Thread Brian Paul 

On 11/28/2014 04:25 AM, Juha-Pekka Heikkila wrote:

Signed-off-by: Juha-Pekka Heikkila juhapekka.heikk...@gmail.com
---
  src/mesa/drivers/common/meta.c | 3 +++
  1 file changed, 3 insertions(+)

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index 87532c1..fab360d 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -403,6 +403,9 @@ _mesa_meta_init(struct gl_context *ctx)
  void
  _mesa_meta_free(struct gl_context *ctx)
  {
+   if (!ctx-Meta)
+  return;
+
 GET_CURRENT_CONTEXT(old_context);
 _mesa_make_current(ctx, NULL, NULL);
 _mesa_meta_glsl_blit_cleanup(ctx-Meta-Blit);


GET_CURRENT_CONTEXT declares a variable so this won't compile with MSVC.

-Brian


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

[Mesa-dev] [PATCH 01/13] mesa/meta: Don't free meta if it was never initialized

2014-11-28 Thread Juha-Pekka Heikkila 
Signed-off-by: Juha-Pekka Heikkila juhapekka.heikk...@gmail.com
---
 src/mesa/drivers/common/meta.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index 87532c1..fab360d 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -403,6 +403,9 @@ _mesa_meta_init(struct gl_context *ctx)
 void
 _mesa_meta_free(struct gl_context *ctx)
 {
+   if (!ctx-Meta)
+  return;
+
GET_CURRENT_CONTEXT(old_context);
_mesa_make_current(ctx, NULL, NULL);
_mesa_meta_glsl_blit_cleanup(ctx-Meta-Blit);
-- 
1.8.5.1

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