Re: [waffle] [PATCH] waffle: add waffle_get_current_*() functions to waffle.def.in
On 11/11/2016 06:17 AM, Emil Velikov wrote: On 10 November 2016 at 21:46, Brian Paul wrote: This fixes the MinGW build. --- src/waffle/waffle.def.in | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/waffle/waffle.def.in b/src/waffle/waffle.def.in index 75a56c0..5803398 100644 --- a/src/waffle/waffle.def.in +++ b/src/waffle/waffle.def.in @@ -32,4 +32,7 @@ EXPORTS waffle_attrib_list_length waffle_attrib_list_get waffle_attrib_list_get_with_default -waffle_attrib_list_update \ No newline at end of file +waffle_attrib_list_update +waffle_get_current_display +waffle_get_current_window +waffle_get_current_context Reviewed-by: Emil Velikov Can you (or Chad?) commit this for me? -Brian ___ waffle mailing list waffle@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/waffle
[waffle] [PATCH] waffle: add waffle_get_current_*() functions to waffle.def.in
This fixes the MinGW build. --- src/waffle/waffle.def.in | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/waffle/waffle.def.in b/src/waffle/waffle.def.in index 75a56c0..5803398 100644 --- a/src/waffle/waffle.def.in +++ b/src/waffle/waffle.def.in @@ -32,4 +32,7 @@ EXPORTS waffle_attrib_list_length waffle_attrib_list_get waffle_attrib_list_get_with_default -waffle_attrib_list_update \ No newline at end of file +waffle_attrib_list_update +waffle_get_current_display +waffle_get_current_window +waffle_get_current_context -- 1.9.1 ___ waffle mailing list waffle@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/waffle
Re: [waffle] long-standing wgl pixel format issue
On 06/20/2016 05:48 PM, Emil Velikov wrote: On 20 June 2016 at 15:46, Brian Paul wrote: On 06/17/2016 07:59 PM, Emil Velikov wrote: On 17 June 2016 at 16:53, Brian Paul wrote: I spent a few hours yesterday pulling out my hair trying to understand why the piglit fbo-mipmap-copypix test was failing on Windows. But it was only failing when I ran it directly. It passed when I ran it via piglit-run.py The key difference was the -fbo option. With -fbo the test used an RGBA8 framebuffer but without -fbo the test used an RGB565 framebuffer. So why is a 565 framebuffer being used? It boils down to the fact that wglChoosePixelFormatARB() does not work like glXChooseFBConfig(). From the glXChooseFBConfig man page: """ GLX_RED_SIZE, GLX_GREEN_SIZE, GLX_BLUE_SIZE, GLX_ALPHA_SIZE Each attribute, if present, must be followed by a nonnegative minimum size specification or GLX_DONT_CARE. The largest available total RGBA color buffer size (sum of GLX_RED_SIZE, GLX_GREEN_SIZE, GLX_BLUE_SIZE, and GLX_ALPHA_SIZE) of at least the minimum size specified for each color component is preferred. """ So if you specify GLX_RED_SIZE, BLUE_SIZE, etc to be 1 and there are both RGB565 and RGBA8 formats available, the _later_ (the largest) will be chosen. But the wglChoosePixelFormatARB docs say: """ Some attribute values must match the pixel format value exactly when the attribute is specified while others specify a minimum criteria, meaning that the pixel format value must meet or exceed the specified value. Attribute TypeMatch Criteria WGL_RED_BITS_ARB integer minimum WGL_GREEN_BITS_ARB integer minimum WGL_BLUE_BITS_ARB integer minimum WGL_ALPHA_BITS_ARB integer minimum """ So if you specify WGL_RED/GREEN/BLUE_BITS_ARB to be 1 and there are both RGB565 and RGBA8 formats available, the _former_ may be chosen. Note that some WGL apps use WGL_COLOR_BITS_ARB=24 and avoid this. Piglit's call to piglit_wfl_framework_init() uses an attribute list with WAFFLE_RED/GREEN/BLUE_SIZE = 1 and that winds up going directly to wglChoosePixelFormatARB and glXChooseFBConfig so this difference in behavior effects the window's pixel format. Thanks for this Brian and apologies I did not spot these differences as I was writing the WGL backend. Here's a bit more comprehensive list, listing all the waffle backends and attributes. GLX/EGL: Largest - red, green, blue, alpha plus their accum counterparts + depth Smallest - buffer, stencil If requested size is zero - "largest" become "smallest" (but it's not said it will be zero), "smallest" become "zero". CGL One that "most closely matches the specified size is preferred" WGL/NaCL "At least", meaning that there's not definition if it's the "smallest" or "largest". Furthermore there's not mention that it will give you the smallest if you specify 0 :-\ The Waffle docs for waffle_config_choose() say: """ WAFFLE_RED_SIZE WAFFLE_GREEN_SIZE WAFFLE_BLUE_SIZE WAFFLE_ALPHA_SIZE WAFFLE_DEPTH_SIZE WAFFLE_STENCIL_SIZE The default value for each size attribute is 0. Valid values are the non-negative integers and WAFFLE_DONT_CARE. If the requested size for a channel is 0, then any surface created with the config will lack that channel. If the requested size for a channel is positive, then the number of bits in that channel for any surface created with the config will be at least the requested size. """ There's some ambiguity here because if several different pixel formats (such as RGB565 and RGBA8) both meet the WAFFLE_RED/GREEN/BLUE_SIZE minimums, which should be preferred? I can fix my Windows Piglit issue by changing Piglit's choose_config_attribs() function to specify WAFFLE_RED/GREEN/BLUE_SIZE=8 instead of 1, but that's not a final solution. I propose: 1. The Waffle docs should be clarified to specify whether the largest or smallest color format should be used when several meet the WAFFLE_*_SIZE minimums. My suggesting is "smallest", like WGL. 2. The Waffle code for either GLX or WGL should be modified to follow that part of the spec. Following my suggestion, the GLX format chooser code would need to be modified. 3. The Piglit code to specify the Waffle pixel format should be updated, probably replacing '1' with '8' as above. And maybe falling back to the former if the later fails (though I doubt anyone runs piglit on less than a 24-bit display nowadays). 4. If Waffle wants to get fancy, we could consider new attributes like WAFFLE_MIN_RED_SIZE, WAFFLE_MAX_RED_SIZE and WAFFLE_EXACT_RED_SIZE to provide more control over format selection. But
Re: [waffle] long-standing wgl pixel format issue
On 06/17/2016 07:59 PM, Emil Velikov wrote: On 17 June 2016 at 16:53, Brian Paul wrote: I spent a few hours yesterday pulling out my hair trying to understand why the piglit fbo-mipmap-copypix test was failing on Windows. But it was only failing when I ran it directly. It passed when I ran it via piglit-run.py The key difference was the -fbo option. With -fbo the test used an RGBA8 framebuffer but without -fbo the test used an RGB565 framebuffer. So why is a 565 framebuffer being used? It boils down to the fact that wglChoosePixelFormatARB() does not work like glXChooseFBConfig(). From the glXChooseFBConfig man page: """ GLX_RED_SIZE, GLX_GREEN_SIZE, GLX_BLUE_SIZE, GLX_ALPHA_SIZE Each attribute, if present, must be followed by a nonnegative minimum size specification or GLX_DONT_CARE. The largest available total RGBA color buffer size (sum of GLX_RED_SIZE, GLX_GREEN_SIZE, GLX_BLUE_SIZE, and GLX_ALPHA_SIZE) of at least the minimum size specified for each color component is preferred. """ So if you specify GLX_RED_SIZE, BLUE_SIZE, etc to be 1 and there are both RGB565 and RGBA8 formats available, the _later_ (the largest) will be chosen. But the wglChoosePixelFormatARB docs say: """ Some attribute values must match the pixel format value exactly when the attribute is specified while others specify a minimum criteria, meaning that the pixel format value must meet or exceed the specified value. Attribute TypeMatch Criteria WGL_RED_BITS_ARB integer minimum WGL_GREEN_BITS_ARB integer minimum WGL_BLUE_BITS_ARB integer minimum WGL_ALPHA_BITS_ARB integer minimum """ So if you specify WGL_RED/GREEN/BLUE_BITS_ARB to be 1 and there are both RGB565 and RGBA8 formats available, the _former_ may be chosen. Note that some WGL apps use WGL_COLOR_BITS_ARB=24 and avoid this. Piglit's call to piglit_wfl_framework_init() uses an attribute list with WAFFLE_RED/GREEN/BLUE_SIZE = 1 and that winds up going directly to wglChoosePixelFormatARB and glXChooseFBConfig so this difference in behavior effects the window's pixel format. Thanks for this Brian and apologies I did not spot these differences as I was writing the WGL backend. Here's a bit more comprehensive list, listing all the waffle backends and attributes. GLX/EGL: Largest - red, green, blue, alpha plus their accum counterparts + depth Smallest - buffer, stencil If requested size is zero - "largest" become "smallest" (but it's not said it will be zero), "smallest" become "zero". CGL One that "most closely matches the specified size is preferred" WGL/NaCL "At least", meaning that there's not definition if it's the "smallest" or "largest". Furthermore there's not mention that it will give you the smallest if you specify 0 :-\ The Waffle docs for waffle_config_choose() say: """ WAFFLE_RED_SIZE WAFFLE_GREEN_SIZE WAFFLE_BLUE_SIZE WAFFLE_ALPHA_SIZE WAFFLE_DEPTH_SIZE WAFFLE_STENCIL_SIZE The default value for each size attribute is 0. Valid values are the non-negative integers and WAFFLE_DONT_CARE. If the requested size for a channel is 0, then any surface created with the config will lack that channel. If the requested size for a channel is positive, then the number of bits in that channel for any surface created with the config will be at least the requested size. """ There's some ambiguity here because if several different pixel formats (such as RGB565 and RGBA8) both meet the WAFFLE_RED/GREEN/BLUE_SIZE minimums, which should be preferred? I can fix my Windows Piglit issue by changing Piglit's choose_config_attribs() function to specify WAFFLE_RED/GREEN/BLUE_SIZE=8 instead of 1, but that's not a final solution. I propose: 1. The Waffle docs should be clarified to specify whether the largest or smallest color format should be used when several meet the WAFFLE_*_SIZE minimums. My suggesting is "smallest", like WGL. 2. The Waffle code for either GLX or WGL should be modified to follow that part of the spec. Following my suggestion, the GLX format chooser code would need to be modified. 3. The Piglit code to specify the Waffle pixel format should be updated, probably replacing '1' with '8' as above. And maybe falling back to the former if the later fails (though I doubt anyone runs piglit on less than a 24-bit display nowadays). 4. If Waffle wants to get fancy, we could consider new attributes like WAFFLE_MIN_RED_SIZE, WAFFLE_MAX_RED_SIZE and WAFFLE_EXACT_RED_SIZE to provide more control over format selection. But I think my suggestion in (1) would avoid this for now. Thoughts? I'm somewhat inclined that the G
[waffle] long-standing wgl pixel format issue
I spent a few hours yesterday pulling out my hair trying to understand why the piglit fbo-mipmap-copypix test was failing on Windows. But it was only failing when I ran it directly. It passed when I ran it via piglit-run.py The key difference was the -fbo option. With -fbo the test used an RGBA8 framebuffer but without -fbo the test used an RGB565 framebuffer. So why is a 565 framebuffer being used? It boils down to the fact that wglChoosePixelFormatARB() does not work like glXChooseFBConfig(). From the glXChooseFBConfig man page: """ GLX_RED_SIZE, GLX_GREEN_SIZE, GLX_BLUE_SIZE, GLX_ALPHA_SIZE Each attribute, if present, must be followed by a nonnegative minimum size specification or GLX_DONT_CARE. The largest available total RGBA color buffer size (sum of GLX_RED_SIZE, GLX_GREEN_SIZE, GLX_BLUE_SIZE, and GLX_ALPHA_SIZE) of at least the minimum size specified for each color component is preferred. """ So if you specify GLX_RED_SIZE, BLUE_SIZE, etc to be 1 and there are both RGB565 and RGBA8 formats available, the _later_ (the largest) will be chosen. But the wglChoosePixelFormatARB docs say: """ Some attribute values must match the pixel format value exactly when the attribute is specified while others specify a minimum criteria, meaning that the pixel format value must meet or exceed the specified value. Attribute TypeMatch Criteria WGL_RED_BITS_ARB integer minimum WGL_GREEN_BITS_ARB integer minimum WGL_BLUE_BITS_ARB integer minimum WGL_ALPHA_BITS_ARB integer minimum """ So if you specify WGL_RED/GREEN/BLUE_BITS_ARB to be 1 and there are both RGB565 and RGBA8 formats available, the _former_ may be chosen. Note that some WGL apps use WGL_COLOR_BITS_ARB=24 and avoid this. Piglit's call to piglit_wfl_framework_init() uses an attribute list with WAFFLE_RED/GREEN/BLUE_SIZE = 1 and that winds up going directly to wglChoosePixelFormatARB and glXChooseFBConfig so this difference in behavior effects the window's pixel format. The Waffle docs for waffle_config_choose() say: """ WAFFLE_RED_SIZE WAFFLE_GREEN_SIZE WAFFLE_BLUE_SIZE WAFFLE_ALPHA_SIZE WAFFLE_DEPTH_SIZE WAFFLE_STENCIL_SIZE The default value for each size attribute is 0. Valid values are the non-negative integers and WAFFLE_DONT_CARE. If the requested size for a channel is 0, then any surface created with the config will lack that channel. If the requested size for a channel is positive, then the number of bits in that channel for any surface created with the config will be at least the requested size. """ There's some ambiguity here because if several different pixel formats (such as RGB565 and RGBA8) both meet the WAFFLE_RED/GREEN/BLUE_SIZE minimums, which should be preferred? I can fix my Windows Piglit issue by changing Piglit's choose_config_attribs() function to specify WAFFLE_RED/GREEN/BLUE_SIZE=8 instead of 1, but that's not a final solution. I propose: 1. The Waffle docs should be clarified to specify whether the largest or smallest color format should be used when several meet the WAFFLE_*_SIZE minimums. My suggesting is "smallest", like WGL. 2. The Waffle code for either GLX or WGL should be modified to follow that part of the spec. Following my suggestion, the GLX format chooser code would need to be modified. 3. The Piglit code to specify the Waffle pixel format should be updated, probably replacing '1' with '8' as above. And maybe falling back to the former if the later fails (though I doubt anyone runs piglit on less than a 24-bit display nowadays). 4. If Waffle wants to get fancy, we could consider new attributes like WAFFLE_MIN_RED_SIZE, WAFFLE_MAX_RED_SIZE and WAFFLE_EXACT_RED_SIZE to provide more control over format selection. But I think my suggestion in (1) would avoid this for now. Thoughts? -Brian ___ waffle mailing list waffle@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/waffle
Re: [waffle] [PATCH 10/33] cmake: build with fPIC when possible
On 07/07/2014 11:28 AM, Emil Velikov wrote:
Some of our third_party libraries may be build without it thus we'll fail at
link tim.
time.
Signed-off-by: Emil Velikov
---
cmake/Modules/WaffleDefineCompilerFlags.cmake | 2 ++
1 file changed, 2 insertions(+)
diff --git a/cmake/Modules/WaffleDefineCompilerFlags.cmake
b/cmake/Modules/WaffleDefineCompilerFlags.cmake
index 4d149c8..96a7a10 100644
--- a/cmake/Modules/WaffleDefineCompilerFlags.cmake
+++ b/cmake/Modules/WaffleDefineCompilerFlags.cmake
@@ -50,6 +50,8 @@ if(waffle_on_linux)
waffle_add_c_flag("-Werror=missing-prototypes" WERROR_MISSING_PROTOTYPES)
endif()
+waffle_add_c_flag("-fPIC" WITH_FPIC)
+
waffle_check_thread_local_storage()
if(waffle_has_tls)
___
waffle mailing list
waffle@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/waffle
Re: [waffle] [PATCH 32/33] utils/wflinfo: wrap if (glHamSandwich() != GL_NO_ERROR ||...) is curly brackets
In the subject line: "in curly brackets"
On 07/07/2014 11:28 AM, Emil Velikov wrote:
... as msvc preprocessor trips over itself and fails.
Signed-off-by: Emil Velikov
---
src/utils/wflinfo.c | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/utils/wflinfo.c b/src/utils/wflinfo.c
index 94ecfea..9543918 100644
--- a/src/utils/wflinfo.c
+++ b/src/utils/wflinfo.c
@@ -535,16 +535,19 @@ print_wflinfo(const struct options *opts)
}
const char *vendor = (const char *) glGetString(GL_VENDOR);
-if (glGetError() != GL_NO_ERROR || vendor == NULL)
+if (glGetError() != GL_NO_ERROR || vendor == NULL) {
vendor = "WFLINFO_GL_ERROR";
+}
const char *renderer = (const char *) glGetString(GL_RENDERER);
-if (glGetError() != GL_NO_ERROR || renderer == NULL)
+if (glGetError() != GL_NO_ERROR || renderer == NULL) {
renderer = "WFLINFO_GL_ERROR";
+}
const char *version_str = (const char *) glGetString(GL_VERSION);
-if (glGetError() != GL_NO_ERROR || version_str == NULL)
+if (glGetError() != GL_NO_ERROR || version_str == NULL) {
version_str = "WFLINFO_GL_ERROR";
+}
const char *platform = enum_map_to_str(platform_map, opts->platform);
assert(platform != NULL);
___
waffle mailing list
waffle@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/waffle
Re: [waffle] [PATCH 09/33] wflinfo: silence signed/unsigned comparison warning
On 07/07/2014 11:28 AM, Emil Velikov wrote:
The variable i is used as and compared vs unsigned int.
Change it's type so silcence the compiler warning.
Signed-off-by: Emil Velikov
---
src/utils/wflinfo.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/utils/wflinfo.c b/src/utils/wflinfo.c
index 3508cc6..58028f9 100644
--- a/src/utils/wflinfo.c
+++ b/src/utils/wflinfo.c
@@ -778,7 +778,7 @@ gl_has_extension_GetStringi(const char *name)
error_printf("Wflinfo", "glGetIntegerv(GL_NUM_EXTENSIONS) failed");
}
-for (int i = 0; i < num_exts; i++) {
+ for (uint32_t i = 0; i < num_exts; i++) {
const uint8_t *ext = glGetStringi(GL_EXTENSIONS, i);
if (!ext || glGetError()) {
error_printf("Wflinfo", "glGetStringi(GL_EXTENSIONS) failed");
I think you used a tab instead of spaces for the indentation.
-Brian
___
waffle mailing list
waffle@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/waffle
Re: [waffle] [PATCH 31/33] utils/wlfinfo: use define to provide buffer lenght
In the subject line: "length"
On 07/07/2014 11:28 AM, Emil Velikov wrote:
... as char buffer[const int] does not work under msvc.
Signed-off-by: Emil Velikov
---
src/utils/wflinfo.c | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/utils/wflinfo.c b/src/utils/wflinfo.c
index a76f9fc..94ecfea 100644
--- a/src/utils/wflinfo.c
+++ b/src/utils/wflinfo.c
@@ -760,26 +760,27 @@ gl_get_version(void)
static bool
gl_has_extension_GetString(const char *name)
{
-const size_t buf_len = 4096;
-char exts[buf_len];
+#define BUF_LEN 4096
+char exts[BUF_LEN];
const uint8_t *exts_orig = glGetString(GL_EXTENSIONS);
if (glGetError()) {
error_printf("Wflinfo", "glGetInteger(GL_EXTENSIONS) failed");
}
-memcpy(exts, exts_orig, buf_len);
-exts[buf_len - 1] = 0;
+memcpy(exts, exts_orig, BUF_LEN);
+exts[BUF_LEN - 1] = 0;
char *ext = strtok(exts, " ");
do {
-if (strneq(ext, name, buf_len)) {
+if (strneq(ext, name, BUF_LEN)) {
return true;
}
ext = strtok(NULL, " ");
} while (ext);
return false;
+#undef BUF_LEN
}
/// @brief Check if current context has an extension using glGetStringi().
___
waffle mailing list
waffle@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/waffle
Re: [waffle] Some new and old fixes
On 07/07/2014 11:28 AM, Emil Velikov wrote: Hi all, After respinning the latest changes (and ripping out WGL as it requires some api/abi changes) here is a lovely list of fixes that gets us closer to building waffle with mingw/msvc. The first four patches are old (three cgl fixes that Chad would like to test prior to pushing them + a patch from Chad). Then a few misc fixes (not related to win32/mingw/msvc) followed by the addition of c99_compat header (inspired by mesa) and a couple of third_party util libs. The last 13 or so patches cover msvc quirks where it should work but instead it dies agony. Please give the series a look and/or bash. Currently is available at https://urldefense.proofpoint.com/v1/url?u=https://github.com/evelikov/waffle&k=oIvRg1%2BdGAgOoM1BIlLLqw%3D%3D%0A&r=lGQMzzTgII0I7jefp2FHq7WtZ%2BTLs8wadB%2BiIj9xpBY%3D%0A&m=F1xU41I%2B64y2KEUiTAB46fYUDS3wxIb%2BMM7vx%2FbbE2o%3D%0A&s=456a72793274bdcd262f1b55258a5468ddd629e06ad2db65bdf45f6f16f8841d in the for-upstream-3 branch. The series looks good to me. Just a few typos, etc. You may want to wait for Chad's review too. Reviewed-by: Brian Paul ___ waffle mailing list waffle@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/waffle
Re: [waffle] Some new and old fixes
On 07/07/2014 11:34 AM, Emil Velikov wrote: On 07/07/14 18:28, Emil Velikov wrote: Hi all, After respinning the latest changes (and ripping out WGL as it requires some api/abi changes) here is a lovely list of fixes that gets us closer to building waffle with mingw/msvc. The first four patches are old (three cgl fixes that Chad would like to test prior to pushing them + a patch from Chad). Then a few misc fixes (not related to win32/mingw/msvc) followed by the addition of c99_compat header (inspired by mesa) and a couple of third_party util libs. The last 13 or so patches cover msvc quirks where it should work but instead it dies agony. Please give the series a look and/or bash. Currently is available at https://urldefense.proofpoint.com/v1/url?u=https://github.com/evelikov/waffle&k=oIvRg1%2BdGAgOoM1BIlLLqw%3D%3D%0A&r=lGQMzzTgII0I7jefp2FHq7WtZ%2BTLs8wadB%2BiIj9xpBY%3D%0A&m=Hyg2ueW%2FDUCrM3M7siIrWmGWstjW3C7l1x79%2BPnugFY%3D%0A&s=2adf272181db957d456a4631cce811bf5012107a42e1f5dee0652988677d6ad7 in the for-upstream-3 branch. Jose, Brian, Can you guys help out a bit with the review of these patches. Most of them are trivial and do not require any knowledge of waffle (apart from the first four). I'm taking a look now. Jose's out this week. -Brian ___ waffle mailing list waffle@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/waffle
Re: [waffle] [PATCH v3 3/3] waffle: add debian packaging
On 01/13/2014 11:11 PM, Jordan Justen wrote:
On Mon, Jan 13, 2014 at 5:26 PM, Brian Paul wrote:
On 01/13/2014 04:55 PM, Jordan Justen wrote:
This builds 4 packages:
* libwaffle-1
* libwaffle-dev (pkgconfig, includes)
* libwaffle-doc (man pages)
* waffle-utils (wflinfo w/man page)
v3:
* Added to v3 of wflinfo series
* Changed copyright to Intel
Signed-off-by: Jordan Justen
---
debian/changelog | 5
debian/compat| 1 +
debian/control | 57
debian/copyright | 33 +
debian/libwaffle-1.install | 1 +
debian/libwaffle-dev.install | 2 ++
debian/libwaffle-doc.install | 2 ++
debian/rules | 21
debian/waffle-utils.install | 2 ++
9 files changed, 124 insertions(+)
create mode 100644 debian/changelog
create mode 100644 debian/compat
create mode 100644 debian/control
create mode 100644 debian/copyright
create mode 100644 debian/libwaffle-1.install
create mode 100644 debian/libwaffle-dev.install
create mode 100644 debian/libwaffle-doc.install
create mode 100755 debian/rules
create mode 100644 debian/waffle-utils.install
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..d50b18a
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+waffle (1.3.0) unstable; urgency=low
+
+ * Add debian packaging
+
+ -- Jordan Justen Mon, 30 Dec 2013 14:50:51
-0800
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..f11c82a
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
\ No newline at end of file
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..b32fa07
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,57 @@
+Source: waffle
+Priority: optional
+Section: libs
+Maintainer: Jordan Justen
+Build-Depends: binutils (>> 2.18),
+ cmake,
+ debhelper (>= 9),
+ docbook-xls,
+ libegl1-mesa-dev | libegl-dev,
+ libgl1-mesa-dev | libgl-dev,
+ libglu1-mesa-dev | libglu-dev,
+ libgbm-dev,
+ libwayland-dev,
+ libx11-dev,
+ pkg-config,
+ xsltproc
+Standards-Version: 3.9.5
+Homepage:
https://urldefense.proofpoint.com/v1/url?u=http://people.freedesktop.org/~chadversary/waffle&k=oIvRg1%2BdGAgOoM1BIlLLqw%3D%3D%0A&r=lGQMzzTgII0I7jefp2FHq7WtZ%2BTLs8wadB%2BiIj9xpBY%3D%0A&m=4Ee2aLuF%2BZDtxBGN2kuCAvxWpu7nT3GllQcQCkVD4D4%3D%0A&s=23a31b797d48c99a64428e7f7fd6265f3ff754bec72f42bd88533707f000c8ba
+Vcs-Git: git://people.freedesktop.org/~chadversary/waffle.git
+Vcs-Browser:
https://urldefense.proofpoint.com/v1/url?u=http://cgit.freedesktop.org/~chadversary/waffle&k=oIvRg1%2BdGAgOoM1BIlLLqw%3D%3D%0A&r=lGQMzzTgII0I7jefp2FHq7WtZ%2BTLs8wadB%2BiIj9xpBY%3D%0A&m=4Ee2aLuF%2BZDtxBGN2kuCAvxWpu7nT3GllQcQCkVD4D4%3D%0A&s=db61fa19a638054d77047c5a1dfa17d895537e06221a2f77abc11285539051cb
+
+Package: libwaffle-1
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Pre-Depends}, ${misc:Depends}
+Description: Waffle library utilities
+ A library for selecting GL API and window system at runtime
Minor nit: s/GL/an OpenGL/
I pulled this text from the first line of the README.txt. I also see a
similar issue on the web-page and the other distro packages.
Maybe this can be addressed as a separate cleanup?
Sure.
-Brian
___
waffle mailing list
waffle@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/waffle
Re: [waffle] [PATCH v3 3/3] waffle: add debian packaging
On 01/13/2014 04:55 PM, Jordan Justen wrote:
This builds 4 packages:
* libwaffle-1
* libwaffle-dev (pkgconfig, includes)
* libwaffle-doc (man pages)
* waffle-utils (wflinfo w/man page)
v3:
* Added to v3 of wflinfo series
* Changed copyright to Intel
Signed-off-by: Jordan Justen
---
debian/changelog | 5
debian/compat| 1 +
debian/control | 57
debian/copyright | 33 +
debian/libwaffle-1.install | 1 +
debian/libwaffle-dev.install | 2 ++
debian/libwaffle-doc.install | 2 ++
debian/rules | 21
debian/waffle-utils.install | 2 ++
9 files changed, 124 insertions(+)
create mode 100644 debian/changelog
create mode 100644 debian/compat
create mode 100644 debian/control
create mode 100644 debian/copyright
create mode 100644 debian/libwaffle-1.install
create mode 100644 debian/libwaffle-dev.install
create mode 100644 debian/libwaffle-doc.install
create mode 100755 debian/rules
create mode 100644 debian/waffle-utils.install
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..d50b18a
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+waffle (1.3.0) unstable; urgency=low
+
+ * Add debian packaging
+
+ -- Jordan Justen Mon, 30 Dec 2013 14:50:51 -0800
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..f11c82a
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
\ No newline at end of file
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..b32fa07
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,57 @@
+Source: waffle
+Priority: optional
+Section: libs
+Maintainer: Jordan Justen
+Build-Depends: binutils (>> 2.18),
+ cmake,
+ debhelper (>= 9),
+ docbook-xls,
+ libegl1-mesa-dev | libegl-dev,
+ libgl1-mesa-dev | libgl-dev,
+ libglu1-mesa-dev | libglu-dev,
+ libgbm-dev,
+ libwayland-dev,
+ libx11-dev,
+ pkg-config,
+ xsltproc
+Standards-Version: 3.9.5
+Homepage:
https://urldefense.proofpoint.com/v1/url?u=http://people.freedesktop.org/~chadversary/waffle&k=oIvRg1%2BdGAgOoM1BIlLLqw%3D%3D%0A&r=lGQMzzTgII0I7jefp2FHq7WtZ%2BTLs8wadB%2BiIj9xpBY%3D%0A&m=4Ee2aLuF%2BZDtxBGN2kuCAvxWpu7nT3GllQcQCkVD4D4%3D%0A&s=23a31b797d48c99a64428e7f7fd6265f3ff754bec72f42bd88533707f000c8ba
+Vcs-Git: git://people.freedesktop.org/~chadversary/waffle.git
+Vcs-Browser:
https://urldefense.proofpoint.com/v1/url?u=http://cgit.freedesktop.org/~chadversary/waffle&k=oIvRg1%2BdGAgOoM1BIlLLqw%3D%3D%0A&r=lGQMzzTgII0I7jefp2FHq7WtZ%2BTLs8wadB%2BiIj9xpBY%3D%0A&m=4Ee2aLuF%2BZDtxBGN2kuCAvxWpu7nT3GllQcQCkVD4D4%3D%0A&s=db61fa19a638054d77047c5a1dfa17d895537e06221a2f77abc11285539051cb
+
+Package: libwaffle-1
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Pre-Depends}, ${misc:Depends}
+Description: Waffle library utilities
+ A library for selecting GL API and window system at runtime
Minor nit: s/GL/an OpenGL/
more GL->OpenGL below.
+
+Package: libwaffle-dev
+Architecture: any
+Section: libdevel
+Depends: libwaffle-1 (= ${binary:Version})
+Suggests: libwaffle-doc
+Description: Waffle library utilities
+ A library for selecting GL API and window system at runtime
+ .
+ This package provides the development environment for compiling
+ programs against the waffle library.
+
+Package: libwaffle-doc
+Architecture: all
+Section: doc
+Description: Waffle library utilities
+ A library for selecting GL API and window system at runtime
+ .
+ This package provides the documentation files for the waffle
+ library.
+
+Package: waffle-utils
+Architecture: any
+Section: utils
+Depends: libwaffle-1 (= ${binary:Version})
+Description: Waffle library utilities
+ A library for selecting GL API and window system at runtime
+ .
+ This package contains waffle utilities.
+ * wflinfo: Creates a GL context and prints information about
+the created context.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..891b397
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,33 @@
+Format:
https://urldefense.proofpoint.com/v1/url?u=http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/&k=oIvRg1%2BdGAgOoM1BIlLLqw%3D%3D%0A&r=lGQMzzTgII0I7jefp2FHq7WtZ%2BTLs8wadB%2BiIj9xpBY%3D%0A&m=4Ee2aLuF%2BZDtxBGN2kuCAvxWpu7nT3GllQcQCkVD4D4%3D%0A&s=66ed7a00fc1dde0db2110fc43b5054b5cccdc1f26bebffb85d231d0551f36dcf
+Upstream-Name: waffle
+Upstream-Contact: Chad Versace
+Source:
https://urldefense.proofpoint.com/v1/url?u=http://cgit.freedesktop.org/~chadversary/waffle&k=oIvRg1%2BdGAgOoM1BIlLLqw%3D%3D%0A&r=lGQMzzTgII0I7jefp2FHq7WtZ%2BTLs8wadB%2BiIj9xpBY%3D%0A&m=4Ee2aLuF%2BZDtxBGN2kuCAvxWpu7nT3GllQcQCkVD4D4%3D%0A&s=db61fa19a638054d77047c5a1dfa17d895537e06221a2f77abc11285539051cb
+
+Files: *
+Copyright: Inte
Re: [waffle] [PATCH] waffle: use enum waffle_error instead of int
On 11/22/2013 05:33 PM, Chad Versace wrote: On 11/15/2013 11:30 AM, Brian Paul wrote: Using the enum type instead of int makes debugging a little easier. It just seems like the right thing to do anyway. Thanks for the improvement, Brian. This is one of my perennical annoyances with OpenGL --- that GLenum is really an int --- so I'm surprised that I repeated the annoyance in waffle. IIRC, in the early days of Mesa, I did define GLenum as a C enum type in gl.h. That was way back before glext.h even existed. I also committed a follow-on patch that did the same to waffle_error_to_string() Great, thanks. -Brian ___ waffle mailing list waffle@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/waffle
[waffle] [PATCH] waffle: use enum waffle_error instead of int
Using the enum type instead of int makes debugging a little easier.
It just seems like the right thing to do anyway.
---
include/waffle/waffle.h|4 ++--
man/waffle_error.3.xml |2 +-
src/waffle/api/waffle_error.c |2 +-
src/waffle/core/wcore_error.c |8
src/waffle/core/wcore_error.h |6 +++---
src/waffle/core/wcore_error_unittest.c |4 ++--
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/include/waffle/waffle.h b/include/waffle/waffle.h
index 0987f36..5f29a5e 100644
--- a/include/waffle/waffle.h
+++ b/include/waffle/waffle.h
@@ -84,12 +84,12 @@ enum waffle_error {
};
struct waffle_error_info {
-int32_t code;
+enum waffle_error code;
const char *message;
size_t message_length;
};
-WAFFLE_API int32_t
+WAFFLE_API enum waffle_error
waffle_error_get_code(void);
WAFFLE_API const struct waffle_error_info*
diff --git a/man/waffle_error.3.xml b/man/waffle_error.3.xml
index c0cbd65..14b01d5 100644
--- a/man/waffle_error.3.xml
+++ b/man/waffle_error.3.xml
@@ -58,7 +58,7 @@ struct waffle_error_info {
-int32_t waffle_error_get_code
+enum waffle_error
waffle_error_get_code
diff --git a/src/waffle/api/waffle_error.c b/src/waffle/api/waffle_error.c
index 01790bc..6e29061 100644
--- a/src/waffle/api/waffle_error.c
+++ b/src/waffle/api/waffle_error.c
@@ -32,7 +32,7 @@
#include "wcore_error.h"
-int32_t
+enum waffle_error
waffle_error_get_code(void)
{
return wcore_error_get_code();
diff --git a/src/waffle/core/wcore_error.c b/src/waffle/core/wcore_error.c
index edcb821..30e96fd 100644
--- a/src/waffle/core/wcore_error.c
+++ b/src/waffle/core/wcore_error.c
@@ -46,7 +46,7 @@ enum {
struct wcore_error_tinfo {
bool is_enabled;
-int32_t code;
+enum waffle_error code;
char message[WCORE_ERROR_MESSAGE_BUFSIZE];
/// @brief The user-visible portion of the error state.
@@ -99,7 +99,7 @@ wcore_error_reset(void)
}
void
-wcore_error(int error)
+wcore_error(enum waffle_error error)
{
struct wcore_error_tinfo *t = wcore_tinfo_get()->error;
@@ -118,7 +118,7 @@ wcore_error(int error)
}
void
-wcore_errorf(int error, const char *format, ...)
+wcore_errorf(enum waffle_error error, const char *format, ...)
{
struct wcore_error_tinfo *t = wcore_tinfo_get()->error;
va_list ap;
@@ -213,7 +213,7 @@ _wcore_error_internal(const char *file, int line, const
char *format, ...)
snprintf(cur, end - cur, " (report this bug to c...@chad-versace.us)");
}
-int
+enum waffle_error
wcore_error_get_code(void)
{
return wcore_tinfo_get()->error->code;
diff --git a/src/waffle/core/wcore_error.h b/src/waffle/core/wcore_error.h
index d466612..882bb6a 100644
--- a/src/waffle/core/wcore_error.h
+++ b/src/waffle/core/wcore_error.h
@@ -57,14 +57,14 @@ wcore_error_reset(void);
///
/// @param error is an `enum waffle_error`.
void
-wcore_error(int error);
+wcore_error(enum waffle_error error);
/// @brief Set error code and message for client.
///
/// @param error is an `enum waffle_error`.
/// @param format may be null.
void
-wcore_errorf(int error, const char *format, ...);
+wcore_errorf(enum waffle_error error, const char *format, ...);
/// @brief Emit error for errno.
///
@@ -87,7 +87,7 @@ wcore_error_errno(const char *format, ...);
} while (0)
/// @brief Get the last set error code.
-int
+enum waffle_error
wcore_error_get_code(void);
/// @brief Get the user-visible portion of the error state.
diff --git a/src/waffle/core/wcore_error_unittest.c
b/src/waffle/core/wcore_error_unittest.c
index 086fb91..19edf99 100644
--- a/src/waffle/core/wcore_error_unittest.c
+++ b/src/waffle/core/wcore_error_unittest.c
@@ -156,14 +156,14 @@ struct thread_arg {
static bool
thread_start(struct thread_arg *a)
{
-static const int error_codes[NUM_THREADS] = {
+static const enum waffle_error error_codes[NUM_THREADS] = {
WAFFLE_ERROR_BAD_ATTRIBUTE,
WAFFLE_ERROR_UNKNOWN,
WAFFLE_ERROR_ALREADY_INITIALIZED,
};
bool ok = true;
-int error_code = error_codes[a->thread_id];
+enum waffle_error error_code = error_codes[a->thread_id];
// Each thread begins in an error-free state.
ok &= wcore_error_get_code() == WAFFLE_NO_ERROR;
--
1.7.10.4
___
waffle mailing list
waffle@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/waffle
[waffle] Bad parameters passed to glXChooseFBConfig
In glx_config.c we're passing -1 for GLX_DEPTH_SIZE and/or GLX_STENCIL_SIZE when those buffers are not requested. The negative values seem to be the defaults in the wcore_config_attrs object, coming from WAFFLE_DONT_CARE=-1. Per the glXGetFBConfig() man page, negative values are not allowed for those attributes. Mesa's fake GLX code (used for xlib/swrast) isn't handling this properly and a lot of piglit tests fail as a consequence. One possible fix would be to add some zero-clamping code like this in glx_config_choose(): GLX_DEPTH_SIZE, MAX2(0, attrs->depth_size), GLX_STENCIL_SIZE, MAX2(0, attrs->stencil_size), I suspect other GLX attribs are also getting illegal negative values too. -Brian ___ waffle mailing list waffle@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/waffle
Re: [waffle] [Piglit] [ANNOUNCE] waffle-1.1.1
On 10/16/2012 04:40 PM, Chad Versace wrote: Waffle 1.1.1 - 16 Oct 2012 == Waffle 1.1.1 is a bugfix release. It fixes bugs discovered since 1.1.0. Downloads and documentation are available at: http://people.freedesktop.org/~chadversary/waffle/releases.html#1.1.1 For the cautious, the SHA256 sum is: 7219d2e02338f7f5410e83087a0465b0a59710e738b771b9b32c0d2b2305c596 There is also a signed waffle-1.1.1 tag in my git repo: git://people.freedesktop.org/~chadversary/waffle Bugfixes - Fix the build for cmake< 2.8.5 by bundling the GNUInstallDirs module into waffle. - Clarify the simple build instructions in README.txt. Chad, this version seems to work fine. Thanks. One little thing: on your waffle web page, s/1.1.0/1.1.1/ -Brian ___ waffle mailing list waffle@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/waffle
Re: [waffle] [Mesa-dev] [ANNOUNCE] waffle-1.1.0
On 10/15/2012 12:42 PM, Chad Versace wrote: On 10/15/2012 11:20 AM, Brian Paul wrote: On 10/15/2012 12:13 PM, Chad Versace wrote: On 10/15/2012 07:57 AM, Brian Paul wrote: On 10/15/2012 02:37 AM, Chad Versace wrote: I unpacked the .xz file, then $ cd waffle-1.1.0 $ export WAFFLE_SOURCE_DIR=$PWD/src $ cmake \ -DCMAKE_LIBRARY_PATH=$(echo $LIBRARY_PATH | sed 's/:/;/g') \ -Dwaffle_has_glx=1 \ -Dwaffle_has_x11_egl=1 \ $WAFFLE_SOURCE_DIR -- The C compiler identification is GNU -- The CXX compiler identification is GNU -- Check for working C compiler: /usr/bin/gcc -- Check for working C compiler: /usr/bin/gcc -- works -- Detecting C compiler ABI info -- Detecting C compiler ABI info - done -- Check for working CXX compiler: /usr/bin/c++ -- Check for working CXX compiler: /usr/bin/c++ -- works -- Detecting CXX compiler ABI info -- Detecting CXX compiler ABI info - done CMake Error at waffle/CMakeLists.txt:141 (target_link_libraries): Cannot specify link libraries for target "dl" which is not built by this project. CMake Warning (dev) in CMakeLists.txt: No cmake_minimum_required command is present. A line of code such as cmake_minimum_required(VERSION 2.8) should be added at the top of the file. The version specified may be lower if you wish to support older CMake versions for this project. For more information run "cmake --help-policy CMP". This warning is for project developers. Use -Wno-dev to suppress it. -- Configuring incomplete, errors occurred! Did I do something wrong? Yes, but so did I. I see now that the build instructions I provided are ambiguous. The try setting WAFFLE_SOURCE_DIR to the top of the tarball, like this: $ cd waffle-1.1.0 $ export WAFFLE_SOURCE_DIR=$PWD $ cmake \ -DCMAKE_LIBRARY_PATH=$(echo $LIBRARY_PATH | sed 's/:/;/g') \ -Dwaffle_has_glx=1 \ -Dwaffle_has_x11_egl=1 \ $WAFFLE_SOURCE_DIR I still get the "Cannot specify link libraries for target "dl" which is not built by this project" error. I can't reproduce this. Does the problem occur on a freshly unpacked tarball on which CMake has never been invoked? Got something different this time: $ cmake -DCMAKE_LIBRARY_PATH=$(echo $LIBRARY_PATH | sed 's/:/;/g') -Dwaffle_has_glx=1 -Dwaffle_has_x11_egl=1 $WAFFLE_SOURCE_DIR -- The C compiler identification is GNU -- Check for working C compiler: /usr/bin/gcc -- Check for working C compiler: /usr/bin/gcc -- works -- Detecting C compiler ABI info -- Detecting C compiler ABI info - done CMake Error at CMakeLists.txt:72 (include): include could not find load file: GNUInstallDirs -- Performing Test waffle_has_tls -- Performing Test waffle_has_tls - Success -- Performing Test waffle_has_tls_model_initial_exec -- Performing Test waffle_has_tls_model_initial_exec - Success -- Library EGL not found -- Library GL found: /usr/lib64/libGL.so -- Library xcb found: /usr/local/lib/libxcb.so -- Library X11 found: /usr/lib64/libX11.so -- Library X11-xcb found: /usr/lib64/libX11-xcb.so CMake Error at doc/CMakeLists.txt:1 (install): install FILES given no DESTINATION! CMake Error at src/waffle/CMakeLists.txt:149 (install): install TARGETS given no LIBRARY DESTINATION for shared library target "waffle-1". --- Waffle configuration summary Supported platforms: glx x11_egl Libraries: EGL: waffle_EGL_library-NOTFOUND GL: /usr/lib64/libGL.so xcb: /usr/local/lib/libxcb.so X11: /usr/lib64/libX11.so X11-xcb: /usr/lib64/libX11-xcb.so Build type: Tools: cc: /usr/bin/gcc CFLAGS_base: --std=c99 -Wall -Werror CFLAGS_debug: -g3 -O0 -DDEBUG CFLAGS_release: -g1 -O2 -DNDEBUG Install paths: CMAKE_INSTALL_PREFIX: /usr/local CMAKE_INSTALL_INCLUDEDIR: CMAKE_INSTALL_LIBDIR: CMAKE_INSTALL_DOCDIR: --- CMake Error: The following variables are used in this project, but they are set to NOTFOUND. Please set them or make sure they are set and tested correctly in the CMake files: waffle_EGL_library linked by target "waffle-1" in directory /home/software/waffle-1.1.0/src/waffle linked by target "waffle_static" in directory /home/software/waffle-1.1.0/src/waffle -- Configuring incomplete, errors occurred! -Brian ___ waffle mailing list waffle@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/waffle
Re: [waffle] [Mesa-dev] [ANNOUNCE] waffle-1.1.0
On 10/15/2012 12:13 PM, Chad Versace wrote: On 10/15/2012 07:57 AM, Brian Paul wrote: On 10/15/2012 02:37 AM, Chad Versace wrote: I unpacked the .xz file, then $ cd waffle-1.1.0 $ export WAFFLE_SOURCE_DIR=$PWD/src $ cmake \ -DCMAKE_LIBRARY_PATH=$(echo $LIBRARY_PATH | sed 's/:/;/g') \ -Dwaffle_has_glx=1 \ -Dwaffle_has_x11_egl=1 \ $WAFFLE_SOURCE_DIR -- The C compiler identification is GNU -- The CXX compiler identification is GNU -- Check for working C compiler: /usr/bin/gcc -- Check for working C compiler: /usr/bin/gcc -- works -- Detecting C compiler ABI info -- Detecting C compiler ABI info - done -- Check for working CXX compiler: /usr/bin/c++ -- Check for working CXX compiler: /usr/bin/c++ -- works -- Detecting CXX compiler ABI info -- Detecting CXX compiler ABI info - done CMake Error at waffle/CMakeLists.txt:141 (target_link_libraries): Cannot specify link libraries for target "dl" which is not built by this project. CMake Warning (dev) in CMakeLists.txt: No cmake_minimum_required command is present. A line of code such as cmake_minimum_required(VERSION 2.8) should be added at the top of the file. The version specified may be lower if you wish to support older CMake versions for this project. For more information run "cmake --help-policy CMP". This warning is for project developers. Use -Wno-dev to suppress it. -- Configuring incomplete, errors occurred! Did I do something wrong? Yes, but so did I. I see now that the build instructions I provided are ambiguous. The try setting WAFFLE_SOURCE_DIR to the top of the tarball, like this: $ cd waffle-1.1.0 $ export WAFFLE_SOURCE_DIR=$PWD $ cmake \ -DCMAKE_LIBRARY_PATH=$(echo $LIBRARY_PATH | sed 's/:/;/g') \ -Dwaffle_has_glx=1 \ -Dwaffle_has_x11_egl=1 \ $WAFFLE_SOURCE_DIR I still get the "Cannot specify link libraries for target "dl" which is not built by this project" error. -Brian ___ waffle mailing list waffle@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/waffle
Re: [waffle] [Mesa-dev] [ANNOUNCE] waffle-1.1.0
On 10/15/2012 02:37 AM, Chad Versace wrote: Waffle 1.1.0 is now available. Downloads and documentation are available at http://people.freedesktop.org/~chadversary/waffle/releases.html#1.1.0 Waffle is a cross-platform library that allows one to defer selection of GL API and of window system until runtime. For example, on Linux, Waffle enables an application to select X11/EGL with an OpenGL 3.3 core profile, Wayland with OpenGL ES2, and other window system / API combinations. The API and ABI of waffle 1.1 is backwards compatible with waffle 1.0. New Features since 1.0 -- - Support for a new Linux platform, EGL with GBM. When using GBM, OpenGL applications do not require a running display manager. - Experimental support for Android. - manpages. The entirety of waffle's public API is now documented in manpages. To build and install them, run CMake with `-Dwaffle_build_manpages=1`. (See the README for build requirements). Acknowledgements Contributors to this release: Chad Versace Jeff Bland Jordan Justen` ___ mesa-dev mailing list mesa-...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev I unpacked the .xz file, then $ cd waffle-1.1.0 $ export WAFFLE_SOURCE_DIR=$PWD/src $ cmake \ -DCMAKE_LIBRARY_PATH=$(echo $LIBRARY_PATH | sed 's/:/;/g') \ -Dwaffle_has_glx=1 \ -Dwaffle_has_x11_egl=1 \ $WAFFLE_SOURCE_DIR -- The C compiler identification is GNU -- The CXX compiler identification is GNU -- Check for working C compiler: /usr/bin/gcc -- Check for working C compiler: /usr/bin/gcc -- works -- Detecting C compiler ABI info -- Detecting C compiler ABI info - done -- Check for working CXX compiler: /usr/bin/c++ -- Check for working CXX compiler: /usr/bin/c++ -- works -- Detecting CXX compiler ABI info -- Detecting CXX compiler ABI info - done CMake Error at waffle/CMakeLists.txt:141 (target_link_libraries): Cannot specify link libraries for target "dl" which is not built by this project. CMake Warning (dev) in CMakeLists.txt: No cmake_minimum_required command is present. A line of code such as cmake_minimum_required(VERSION 2.8) should be added at the top of the file. The version specified may be lower if you wish to support older CMake versions for this project. For more information run "cmake --help-policy CMP". This warning is for project developers. Use -Wno-dev to suppress it. -- Configuring incomplete, errors occurred! Did I do something wrong? BTW, shouldn't the piglit docs be updated with some mention of waffle? -Brian ___ waffle mailing list waffle@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/waffle
