summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-04-17debian: Set version to 1.3.90~git20140417.a0a0fdc-1debianJordan Justen1-0/+6
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
2014-04-17README: Add debian package install commandsJordan Justen1-0/+6
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
2014-04-17man: run xsltproc with -nonetJordan Justen2-2/+2
This speeds up package builds for debian considerably, but adds a requirement on the docbook-xsl package. [chadv] Reduces `ninja man` from 20s to 1.25s. Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
2014-04-17wflinfo: Print all error messages to stderr, not stdoutChad Versace1-10/+7
Some tools interpret messages on stderr as *errors*, and treat stdout differently, and sometimes ignore stdout completely. Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
2014-04-17core: Update url for issue tracker in error messagesChad Versace1-1/+1
If Waffle encounters an internal error, then direct the user to report a bug on the issue tracker. Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
2014-04-15debian: fix source package name typoJordan Justen1-1/+1
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
2014-04-14debian: bump version to 1.3.90Jordan Justen1-0/+6
Signed-off-by: Jordan Justen <jljusten@gmail.com>
2014-04-01examples: Remove dead codeChad Versace1-1/+0
simple-x11-egl called glClearColor back-to-back. Remove the first call. Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
2014-03-30Merge branch 'move-to-github'Chad Versace24-23/+68
2014-03-30man: Add Issues section to all manpagesChad Versace21-0/+54
Add the following text to all manpages: Issues Please report bugs or and feature requests to https://github.com/waffle-gl/waffle/issues. Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
2014-03-30man: Update urls to source repo and example codeChad Versace1-3/+4
Waffle's git repo has moved from Freedesktop to Github. Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
2014-03-30man/wflinfo: Remove redundant info in See AlsoChad Versace1-8/+0
Remove links to website and source repo. The main waffle(7) manpage provides those links. Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
2014-03-30debian: Update Vcs-Git and Vcs-Browser urlsChad Versace2-3/+3
Waffle moved to Freedesktop to Github. Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
2014-03-30README: Resort the Links sectionChad Versace1-4/+4
Sort from most to least important.
2014-03-30README: Move git urls from Freedesktop to GithubChad Versace1-3/+3
Waffle's git repo now lives on Github.
2014-03-30README: Remove link to example code on websiteChad Versace1-5/+2
That example code on the website is difficult to keep up-to-date, so I removed it. People should now refer to the examples directory in the source repo.
2014-03-30README: Add url to issue tracker on GithubChad Versace1-0/+1
2014-03-12egl: Fix creation of compatibility contextsChad Versace1-0/+17
wegl_context_create() ignored wcore_config_attrs::context_profile and never set EGL_CONTEXT_OPENGL_PROFILE_MASK_KHR. The default value of EGL_CONTEXT_OPENGL_PROFILE_MASK_KHR is EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT_KHR. Therefore, for context versions >= 3.2, wegl_context_create() always created a core context. This patch fixes wegl_context_create() to inspect wcore_config_attrs::context_profile and set EGL_CONTEXT_OPENGL_PROFILE_MASK_KHR accordingly. Fixes: https://github.com/waffle-gl/waffle/issues/1 Reported-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Jordan Justen <jordan.l.justen@intel.com> Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
2014-03-07wflinfo: Fix error message regression on context creation failureChad Versace1-9/+30
Recent patches which permitted users to call wflinfo with --version introduced an error message regression. If wflinfo fails to create a context, then this is wflinfo's sole output, pre-patch: Waffle error: 0x0 WAFFLE_NO_ERROR This patch fixes wflinfo to print the underlying Waffle error or: Waffle error: 0x8 WAFFLE_ERROR_BAD_ATTRIBUTE:# Please enter the commit message for your changes. Lines starting Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
2014-03-07utils/wflinfo: allow requesting a compat profile without a versionJordan Justen1-6/+6
Similar to the behavior of --profile=core, we will now scan a list of 'known' profile supporting GL versions when the user requests a compat profile, but does not specify a version. Tested on the NVIDIA 310.44 driver. It exposes GL_ARB_compatibility as expected when --profile=compat is used, and does not when --profile=core is used. Signed-off-by: Jordan Justen <jljusten@gmail.com> Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
2014-03-07wflinfo: Initialize opts->context_profile to WAFFLE_NONE, not -1Chad Versace1-2/+2
wflinfo initialized context_profile to -1 so that it could detect if the user gave --profile on the cmdline. But wflinfo didn't use that information. This patch should not change wflinfo's behavior. But it's required to make work Jordan's next patch to allow --profile=compat without --version. Signed-off-by: Chad Versace <chad.versace@linux.intel.com> Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
2014-03-07utils/wflinfo: allow requesting a core profile without a versionJordan Justen1-51/+102
Previously, this command would fail: wflinfo --platform=glx --api=gl --profile=core Unless the --version parameter was also added. Now, if --version is not specified, and we are trying to create an OpenGL CORE profile, then wflinfo will try a set of known OpenGL CORE profile versions and will print information for the highest version profile created. v2: * remove 3.1 from 'known' core profile versions Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
2014-03-01wfinfo: Add short option -h for --helpChad Versace2-3/+4
Document it in the manpage too. Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
2014-03-01android: Fix build for Android 4.1Arun Sl1-0/+11
The signature of SurfaceComposerClient::createSurface() changed from Android 4.1 to 4.2. Tested-by: Juha-Pekka Heikkilä <juha-pekka.heikkila@linux.intel.com>
2014-03-01android: Improve name of 'error' goto labelArun Sl1-1/+2
s/error1/error_droid_create_surface/
2014-02-13pkg/gentoo: Remove.Matt Turner2-68/+0
waffle is available in the main gentoo tree under media-libs/waffle.
2014-02-07wflinfo: make errors parsableJordan Justen1-15/+19
Previously, if there was an error, then wflinfo would print various not easily parsable messages to stderr. Now, all output will be printed to stdout, and will follow a similar format to the normal wflinfo output. Errors from the waffle library will show up like: Waffle error: 0x%x Some string Additionally, these may be printed: Wflinfo error: Misc error w/o a waffle error code Wflinfo usage error: usage error message (see wflinfo --help) Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
2014-02-07wflinfo: add --help parameterJordan Justen2-3/+25
--help will cause wflinfo to print usage information to stdout and exit with a return code of 0. Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
2014-02-07gitignore: Ignore html manpageChad Versace1-0/+1
Ignore waffle_feature_test_macros.7.html. Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
2014-01-25Merge branch 'wflinfo-short-opts'Chad Versace2-25/+43
2014-01-25wflinfo: implement short options for common parametersJordan Justen2-9/+17
-p for --platform -a for --api -V for --version -v for --verbose Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
2014-01-25wflinfo man page: highlight 'replaceable' itemsJordan Justen1-3/+3
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
2014-01-25wflinfo: if a parameter is not given, don't print NULL stringJordan Justen1-1/+4
If a parameter was not given for an option, for example: wflinfo --platform Then we would try to print a NULL string. Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
2014-01-25wflinfo: Clean usage textJordan Justen1-15/+22
Cleaning up and re-organizing to allow short version parameters to be added. Signed-off-by: Jordan Justen <jljusten@gmail.com> Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
2014-01-19Merge branch 'wflinfo-mac'Chad Versace2-12/+6
This series gets wflinfo working on Mac. On Mac we now have the same insight as provided by glxinfo on Linux. Here's the info from my MacBook Pro: Waffle platform: cgl Waffle api: gl OpenGL vendor string: ATI Technologies Inc. OpenGL renderer string: AMD Radeon HD 6750M OpenGL Engine OpenGL version string: 4.1 ATI-1.14.21 OpenGL context flags: FORWARD_COMPATIBLE OpenGL extensions: GL_ARB_blend_func_extended GL_ARB_draw_buffers_blend GL_ARB_draw_indirect GL_ARB_ES2_compatibility GL_ARB_explicit_attrib_location GL_ARB_gpu_shader5 GL_ARB_instanced_arrays GL_ARB_internalformat_query GL_ARB_occlusion_query2 GL_ARB_sample_shading GL_ARB_sampler_objects GL_ARB_separate_shader_objects GL_ARB_shader_bit_encoding GL_ARB_shader_subroutine GL_ARB_shading_language_include GL_ARB_tessellation_shader GL_ARB_texture_buffer_object_rgb32 GL_ARB_texture_cube_map_array GL_ARB_texture_gather GL_ARB_texture_query_lod GL_ARB_texture_rgb10_a2ui GL_ARB_texture_storage GL_ARB_texture_swizzle GL_ARB_timer_query GL_ARB_transform_feedback2 GL_ARB_transform_feedback3 GL_ARB_vertex_type_2_10_10_10_rev GL_ARB_viewport_array GL_EXT_debug_label GL_EXT_debug_marker GL_EXT_texture_compression_s3tc GL_EXT_texture_filter_anisotropic GL_EXT_texture_mirror_clamp GL_EXT_texture_sRGB_decode GL_APPLE_client_storage GL_APPLE_container_object_shareable GL_APPLE_flush_render GL_APPLE_object_purgeable GL_APPLE_rgb_422 GL_APPLE_row_bytes GL_APPLE_texture_range GL_ATI_texture_mirror_once GL_NV_texture_barrier
2014-01-19cgl: Make waffle_get_proc_address() workChad Versace1-4/+6
There is no CGLGetProcAddress, so waffle_get_proc_address() always emitted an error. However, this patch changes it to follow the principle of least surprise. The only supported API on CGL is OpenGL, so assume the user called waffle_get_proc_address() to obtain an OpenGL function pointer and get it with dlsym(). Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
2014-01-19wflinfo: Build on MacChad Versace1-8/+0
I tested that wflinfo doesn't break the build on Mac. Despite building, though, it doesn't work. Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
2014-01-15waffle utils: add Android.mkJordan Justen1-0/+21
This should allow wflinfo to get built for android. v2 (chadv): Fix LOCAL_C_INCLUDES, as pointed out by Juha-Pekka. Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> Signed-off-by: Chad Versace <chad.versace@linux.intel.com> Tested-by: Juha-Pekka Heikkilä <juha-pekka.heikkila@linux.intel.com>
2014-01-15man/wflinfo: Remove trailing commaChad Versace1-1/+1
Trivial change. Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
2014-01-15waffle: add debian packagingJordan Justen9-0/+124
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 <jordan.l.justen@intel.com> Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
2014-01-15waffle utils: add wflinfo man pageJordan Justen9-0/+211
v3: * Move description section up Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
2014-01-15waffle utils: add wflinfo utilityJordan Justen4-0/+763
glxinfo for waffle, but using the command line interface of waffle's gl_basic test. v2 (jljusten): * Various cleanups suggested by Chad * Print context flags rather than verifying them. * Only print extensions when --verbose is used v3 (jljusten): * "GL ERROR" => "WFLINFO_GL_ERROR" * print_extensions: fix cases that did not print a newline * In print_context_flags: - print WFLINFO_GL_ERROR when there is an error - print 0x0 rather than (none) * print vendor/renderer/version/context flags before checking for GetStringi * Add 'Waffle platform' and 'Waffle api' output * Change --debug to --debug-context v4 (chadv): * Don't build wflinfo on Mac. Since no one has tested it, so it may break the build. Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
2014-01-08wayland: respond to ping requests from the compositorRob Bradford1-0/+33
The ping/pong protocol on the shell surface is used by the compositor to check that the client is responding to requests. This change adds a listener for the shell surface and implements the ping handler to respond to the requests from the compositor. As the wayland dispatch infrastructure does not support having NULL values for the members of the listener it is necessary to provide empty implementations for the other events that the listener handles. Signed-off-by: Rob Bradford <rob@linux.intel.com> Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
2014-01-08wayland: add a handler for global remove eventRob Bradford1-1/+8
The Wayland event dispatch infrastructure does not check if the event handler member is NULL before dereferencing the appropriate member in the listener. This change supplies an empty function as the event handler for the global remove event on the wl_registry listener rather than the previously supplied NULL value. Signed-off-by: Rob Bradford <rob@linux.intel.com> Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
2013-12-21examples/gl_basic: Rename gl_basic_error() -> error_printf()Chad Versace1-8/+8
The new name better reflects what it does. It accepts a printf format string. Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
2013-12-02cmake: Fix dependency on cmockaChad Versace1-1/+1
This fixes an error in the Makefile-dependency of unittests, introduced in commit ad40427a864a7436953b319fbfdb2c04ccb7bdab. From the perspective of Waffle's CMake, libcmocka.so is an *imported* library. In other words, it's a virtual target, represented by a '.PHONY' target in Unix Makefiles. To guarantee that libcmocka.so gets built, CMake must declare that the .PHONY 'cmocka' target depends on another .PHONY target, which does the actual building. Making 'cmocka' depend on a non-PHONY target doesn't work. Reported-by: Shazia Rahman <srahman@nvidia.com> Reported-by: Paul Berry <stereotype441@gmail.com> Tested-by: Paul Berry <stereotype441@gmail.com> Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
2013-12-02gitignore: Fix .gitignore for recently added tests.Paul Berry1-0/+3
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
2013-12-02android: Fix Android Kitkat build issueJuha-Pekka Heikkila1-0/+1
Changes in Android Kitkat required one extra include file to allow using ANativeWindow. Signed-off-by: Juha-Pekka Heikkila <juha-pekka.heikkila@linux.intel.com> Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
2013-12-01cmake: Don't build unittests when waffle_build_tests=0Chad Versace1-0/+4
Return early from add_unittest() if waffle_build_tests=0, making the function a no-op. Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
2013-12-01Merge branch 'cmocka'Chad Versace70-674/+10607
This merge makes progress towards killing off libwaffle_test and replacing it with cmocka. - Add subtree 'third_party/cmocka' from tag cmocka-0.3.2. - Convert all unit test executables to use cmocka. They no longer use libwaffle_test. - The only remaining user of libwaffle_test is gl_basic_test, which I will also move to cmocka eventually.