mirror of
				https://github.com/glfw/glfw.git
				synced 2025-11-03 22:04:15 +00:00 
			
		
		
		
	Added getopt and sample count switch to FSAA test.
This commit is contained in:
		
							parent
							
								
									940b69816c
								
							
						
					
					
						commit
						57e14372f2
					
				@ -5,6 +5,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../include ${OPENGL_INCLUDE_DIR}
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
add_executable(defaults defaults.c)
 | 
					add_executable(defaults defaults.c)
 | 
				
			||||||
add_executable(events events.c)
 | 
					add_executable(events events.c)
 | 
				
			||||||
 | 
					add_executable(fsaa fsaa.c getopt.c)
 | 
				
			||||||
add_executable(fsfocus fsfocus.c)
 | 
					add_executable(fsfocus fsfocus.c)
 | 
				
			||||||
add_executable(gamma gamma.c getopt.c)
 | 
					add_executable(gamma gamma.c getopt.c)
 | 
				
			||||||
add_executable(iconify iconify.c getopt.c)
 | 
					add_executable(iconify iconify.c getopt.c)
 | 
				
			||||||
@ -17,7 +18,6 @@ add_executable(version version.c getopt.c)
 | 
				
			|||||||
if(APPLE)
 | 
					if(APPLE)
 | 
				
			||||||
  # Set fancy names for bundles
 | 
					  # Set fancy names for bundles
 | 
				
			||||||
  add_executable(Accuracy MACOSX_BUNDLE accuracy.c)
 | 
					  add_executable(Accuracy MACOSX_BUNDLE accuracy.c)
 | 
				
			||||||
  add_executable(FSAA MACOSX_BUNDLE fsaa.c)
 | 
					 | 
				
			||||||
  add_executable(Sharing MACOSX_BUNDLE sharing.c)
 | 
					  add_executable(Sharing MACOSX_BUNDLE sharing.c)
 | 
				
			||||||
  add_executable(Tearing MACOSX_BUNDLE tearing.c)
 | 
					  add_executable(Tearing MACOSX_BUNDLE tearing.c)
 | 
				
			||||||
  add_executable(Windows MACOSX_BUNDLE windows.c)
 | 
					  add_executable(Windows MACOSX_BUNDLE windows.c)
 | 
				
			||||||
@ -26,7 +26,6 @@ else()
 | 
				
			|||||||
  add_executable(accuracy WIN32 accuracy.c)
 | 
					  add_executable(accuracy WIN32 accuracy.c)
 | 
				
			||||||
  add_executable(sharing WIN32 sharing.c)
 | 
					  add_executable(sharing WIN32 sharing.c)
 | 
				
			||||||
  add_executable(tearing WIN32 tearing.c)
 | 
					  add_executable(tearing WIN32 tearing.c)
 | 
				
			||||||
  add_executable(fsaa WIN32 fsaa.c)
 | 
					 | 
				
			||||||
  add_executable(windows WIN32 windows.c)
 | 
					  add_executable(windows WIN32 windows.c)
 | 
				
			||||||
endif(APPLE)
 | 
					endif(APPLE)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										38
									
								
								tests/fsaa.c
									
									
									
									
									
								
							
							
						
						
									
										38
									
								
								tests/fsaa.c
									
									
									
									
									
								
							@ -35,23 +35,51 @@
 | 
				
			|||||||
#include <stdio.h>
 | 
					#include <stdio.h>
 | 
				
			||||||
#include <stdlib.h>
 | 
					#include <stdlib.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "getopt.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void window_size_callback(GLFWwindow window, int width, int height)
 | 
					static void window_size_callback(GLFWwindow window, int width, int height)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    glViewport(0, 0, width, height);
 | 
					    glViewport(0, 0, width, height);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
int main(void)
 | 
					static void usage(void)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    int samples;
 | 
					    printf("Usage: fsaa [-h] [-s SAMPLES]\n");
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					int main(int argc, char** argv)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    int ch, samples = 4;
 | 
				
			||||||
    GLFWwindow window;
 | 
					    GLFWwindow window;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    while ((ch = getopt(argc, argv, "hs:")) != -1)
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
 | 
					        switch (ch)
 | 
				
			||||||
 | 
					        {
 | 
				
			||||||
 | 
					            case 'h':
 | 
				
			||||||
 | 
					                usage();
 | 
				
			||||||
 | 
					                exit(EXIT_SUCCESS);
 | 
				
			||||||
 | 
					            case 's':
 | 
				
			||||||
 | 
					                samples = atoi(optarg);
 | 
				
			||||||
 | 
					                break;
 | 
				
			||||||
 | 
					            default:
 | 
				
			||||||
 | 
					                usage();
 | 
				
			||||||
 | 
					                exit(EXIT_FAILURE);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (!glfwInit())
 | 
					    if (!glfwInit())
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        fprintf(stderr, "Failed to initialize GLFW: %s\n", glfwErrorString(glfwGetError()));
 | 
					        fprintf(stderr, "Failed to initialize GLFW: %s\n", glfwErrorString(glfwGetError()));
 | 
				
			||||||
        exit(EXIT_FAILURE);
 | 
					        exit(EXIT_FAILURE);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    glfwOpenWindowHint(GLFW_FSAA_SAMPLES, 4);
 | 
					    if (samples)
 | 
				
			||||||
 | 
					        printf("Requesting FSAA with %i samples\n", samples);
 | 
				
			||||||
 | 
					    else
 | 
				
			||||||
 | 
					        printf("Requesting that FSAA not be available\n");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    glfwOpenWindowHint(GLFW_FSAA_SAMPLES, samples);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    window = glfwOpenWindow(800, 400, GLFW_WINDOWED, "Aliasing Detector", NULL);
 | 
					    window = glfwOpenWindow(800, 400, GLFW_WINDOWED, "Aliasing Detector", NULL);
 | 
				
			||||||
    if (!window)
 | 
					    if (!window)
 | 
				
			||||||
@ -67,9 +95,9 @@ int main(void)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    samples = glfwGetWindowParam(window, GLFW_FSAA_SAMPLES);
 | 
					    samples = glfwGetWindowParam(window, GLFW_FSAA_SAMPLES);
 | 
				
			||||||
    if (samples)
 | 
					    if (samples)
 | 
				
			||||||
        printf("Context reports FSAA is supported with %i samples\n", samples);
 | 
					        printf("Context reports FSAA is available with %i samples\n", samples);
 | 
				
			||||||
    else
 | 
					    else
 | 
				
			||||||
        printf("Context reports FSAA is unsupported\n");
 | 
					        printf("Context reports FSAA is unavailable\n");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    glMatrixMode(GL_PROJECTION);
 | 
					    glMatrixMode(GL_PROJECTION);
 | 
				
			||||||
    gluOrtho2D(0.f, 1.f, 0.f, 0.5f);
 | 
					    gluOrtho2D(0.f, 1.f, 0.f, 0.5f);
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user