gwm17/glfw
1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2024-11-23 02:38:52 -05:00
Code Issues Projects Releases Wiki Activity

Renamed MSAA test program.

Browse Source
This commit is contained in:
Camilla Berglund 2015-05-19 15:16:42 +02:00
parent 8f0fd7ecf5
commit a1641cdec9
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/CMakeLists.txt
View File

@ -23,7 +23,7 @@ set(TINYCTHREAD "${GLFW_SOURCE_DIR}/deps/tinycthread.h"
add_executable(clipboard clipboard.c ${GETOPT}) add_executable(clipboard clipboard.c ${GETOPT})
add_executable(defaults defaults.c) add_executable(defaults defaults.c)
add_executable(events events.c ${GETOPT}) add_executable(events events.c ${GETOPT})
add_executable(fsaa fsaa.c ${GETOPT}) add_executable(msaa msaa.c ${GETOPT})
add_executable(gamma gamma.c ${GETOPT}) add_executable(gamma gamma.c ${GETOPT})
add_executable(glfwinfo glfwinfo.c ${GETOPT}) add_executable(glfwinfo glfwinfo.c ${GETOPT})
add_executable(iconify iconify.c ${GETOPT}) add_executable(iconify iconify.c ${GETOPT})
@ -61,7 +61,7 @@ target_link_libraries(empty "${CMAKE_THREAD_LIBS_INIT}" "${RT_LIBRARY}")
target_link_libraries(threads "${CMAKE_THREAD_LIBS_INIT}" "${RT_LIBRARY}") target_link_libraries(threads "${CMAKE_THREAD_LIBS_INIT}" "${RT_LIBRARY}")
set(WINDOWS_BINARIES accuracy empty sharing tearing threads title windows cursoranim) set(WINDOWS_BINARIES accuracy empty sharing tearing threads title windows cursoranim)
set(CONSOLE_BINARIES clipboard defaults events fsaa gamma glfwinfo set(CONSOLE_BINARIES clipboard defaults events msaa gamma glfwinfo
iconify joysticks monitors peter reopen cursor) iconify joysticks monitors peter reopen cursor)
set_target_properties(${WINDOWS_BINARIES} ${CONSOLE_BINARIES} PROPERTIES set_target_properties(${WINDOWS_BINARIES} ${CONSOLE_BINARIES} PROPERTIES

2
tests/defaults.c
View File

@ -57,7 +57,7 @@ static AttribGL gl_attribs[] =
{ GL_DEPTH_BITS, NULL, "depth bits" }, { GL_DEPTH_BITS, NULL, "depth bits" },
{ GL_STENCIL_BITS, NULL, "stencil bits" }, { GL_STENCIL_BITS, NULL, "stencil bits" },
{ GL_STEREO, NULL, "stereo" }, { GL_STEREO, NULL, "stereo" },
{ GL_SAMPLES_ARB, "GL_ARB_multisample", "FSAA samples" }, { GL_SAMPLES_ARB, "GL_ARB_multisample", "MSAA samples" },
{ 0, NULL, NULL } { 0, NULL, NULL }
}; };

14
tests/fsaa.c → tests/msaa.c
View File

@ -1,5 +1,5 @@
//======================================================================== //========================================================================
// Full screen anti-aliasing test // Multisample anti-aliasing test
// Copyright (c) Camilla Berglund <elmindreda@elmindreda.org> // Copyright (c) Camilla Berglund <elmindreda@elmindreda.org>
// //
// This software is provided 'as-is', without any express or implied // This software is provided 'as-is', without any express or implied
@ -25,7 +25,7 @@
// //
// This test renders two high contrast, slowly rotating quads, one aliased // This test renders two high contrast, slowly rotating quads, one aliased
// and one (hopefully) anti-aliased, thus allowing for visual verification // and one (hopefully) anti-aliased, thus allowing for visual verification
// of whether FSAA is indeed enabled // of whether MSAA is indeed enabled
// //
//======================================================================== //========================================================================
@ -62,7 +62,7 @@ static void key_callback(GLFWwindow* window, int key, int scancode, int action,
static void usage(void) static void usage(void)
{ {
printf("Usage: fsaa [-h] [-s SAMPLES]\n"); printf("Usage: msaa [-h] [-s SAMPLES]\n");
} }
int main(int argc, char** argv) int main(int argc, char** argv)
@ -92,9 +92,9 @@ int main(int argc, char** argv)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
if (samples) if (samples)
printf("Requesting FSAA with %i samples\n", samples); printf("Requesting MSAA with %i samples\n", samples);
else else
printf("Requesting that FSAA not be available\n"); printf("Requesting that MSAA not be available\n");
glfwWindowHint(GLFW_SAMPLES, samples); glfwWindowHint(GLFW_SAMPLES, samples);
glfwWindowHint(GLFW_VISIBLE, GL_FALSE); glfwWindowHint(GLFW_VISIBLE, GL_FALSE);
@ -124,9 +124,9 @@ int main(int argc, char** argv)
glGetIntegerv(GL_SAMPLES_ARB, &samples); glGetIntegerv(GL_SAMPLES_ARB, &samples);
if (samples) if (samples)
printf("Context reports FSAA is available with %i samples\n", samples); printf("Context reports MSAA is available with %i samples\n", samples);
else else
printf("Context reports FSAA is unavailable\n"); printf("Context reports MSAA is unavailable\n");
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
glOrtho(0.f, 1.f, 0.f, 0.5f, 0.f, 1.f); glOrtho(0.f, 1.f, 0.f, 0.5f, 0.f, 1.f);