<html dir="ltr">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<style type="text/css" id="owaParaStyle"></style>
</head>
<body fpstyle="1" ocsi="0">
<div style="direction: ltr;font-family: Tahoma;color: #000000;font-size: 10pt;">
<div>From 4d4559ce571a789105376311f1eecbe6031cbf02 Mon Sep 17 00:00:00 2001</div>
<div>From: Henry Song <hsong@sisa.samsung.com></div>
<div>Date: Tue, 8 Jan 2013 09:57:32 -0800</div>
<div>Subject: [PATCH] gl: re-enable gl-surface-source test for nsgl, and a little</div>
<div> bug fix in cairo_nsgl_device_create(), we need to retain it before</div>
<div> makecurrent</div>
<div><br>
</div>
<div>---</div>
<div> src/cairo-nsgl-context.m | 3 +--</div>
<div> test/Makefile.am | 8 +++++++-</div>
<div> test/Makefile.sources | 5 ++++-</div>
<div> 3 files changed, 12 insertions(+), 4 deletions(-)</div>
<div><br>
</div>
<div>diff --git a/src/cairo-nsgl-context.m b/src/cairo-nsgl-context.m</div>
<div>index b3e893c..b40e035 100644</div>
<div>--- a/src/cairo-nsgl-context.m</div>
<div>+++ b/src/cairo-nsgl-context.m</div>
<div>@@ -121,9 +121,8 @@ cairo_nsgl_device_create (void *abstract_ctx)</div>
<div> if (unlikely (ctx == NULL))</div>
<div> <span class="Apple-tab-span" style="white-space:pre"> </span>return _cairo_gl_context_create_in_error (CAIRO_STATUS_NO_MEMORY);</div>
<div> </div>
<div>- [ctx->context makeCurrentContext];</div>
<div>-</div>
<div> ctx->context = [nsgl_ctx retain];</div>
<div>+ [ctx->context makeCurrentContext];</div>
<div> </div>
<div> ctx->base.acquire = _nsgl_acquire;</div>
<div> ctx->base.release = _nsgl_release;</div>
<div>diff --git a/test/Makefile.am b/test/Makefile.am</div>
<div>index 1e148d7..472d1b4 100644</div>
<div>--- a/test/Makefile.am</div>
<div>+++ b/test/Makefile.am</div>
<div>@@ -17,7 +17,13 @@ endif</div>
<div> endif</div>
<div> </div>
<div> if CAIRO_HAS_GL_SURFACE</div>
<div>-test_sources += $(gl_surface_test_sources)</div>
<div>+if CAIRO_HAS_GLX_FUNCTIONS</div>
<div>+ test_sources += $(gl_surface_test_sources)</div>
<div>+else</div>
<div>+if CAIRO_HAS_NSGL_FUNCTIONS</div>
<div>+ test_sources += $(nsgl_surface_test_sources)</div>
<div>+endif</div>
<div>+endif</div>
<div> endif</div>
<div> </div>
<div> # Need to add quartz-surface-source</div>
<div>diff --git a/test/Makefile.sources b/test/Makefile.sources</div>
<div>index 74a3623..fc0625c 100644</div>
<div>--- a/test/Makefile.sources</div>
<div>+++ b/test/Makefile.sources</div>
<div>@@ -390,9 +390,12 @@ ft_font_test_sources = \</div>
<div> <span class="Apple-tab-span" style="white-space:pre"> </span>ft-text-vertical-layout-type3.c \</div>
<div> <span class="Apple-tab-span" style="white-space:pre"> </span>ft-text-antialias-none.c</div>
<div> </div>
<div>-#gl_surface_test_sources = \</div>
<div>+gl_surface_test_sources = \</div>
<div> <span class="Apple-tab-span" style="white-space:pre"> </span>gl-surface-source.c</div>
<div> </div>
<div>+nsgl_surface_test_sources = \</div>
<div>+<span class="Apple-tab-span" style="white-space:pre"> </span>nsgl-surface-source.m</div>
<div>+</div>
<div> quartz_surface_test_sources = quartz-surface-source.c</div>
<div> </div>
<div> pdf_surface_test_sources = \</div>
<div>-- </div>
<div>1.8.0.1</div>
<div><br>
</div>
</div>
</body>
</html>