Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Emscripten glInfoExample fix #7211

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Emscripten glInfoExample fix #7211

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2b77dbf
Update ofConstants.h
Jonathhhan Nov 25, 2022
7db526a
Update ofConstants.h
Jonathhhan Nov 25, 2022
b35de67
Merge branch 'openframeworks:master' into master
Jonathhhan Nov 26, 2022
8ef9721
Update ofApp.cpp
Jonathhhan Nov 26, 2022
80343fd
Update ofApp.cpp
Jonathhhan Nov 26, 2022
8aa62ef
Update ofApp.cpp
Jonathhhan Nov 28, 2022
f9a299c
Update ofApp.cpp
Jonathhhan Nov 28, 2022
2e87226
Update ofApp.cpp
Jonathhhan Nov 28, 2022
7cabc7f
Update ofApp.cpp
Jonathhhan Nov 28, 2022
dd1a871
Merge branch 'openframeworks:master' into Emscripten-glInfoExample-fix
Jonathhhan Feb 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
92 changes: 44 additions & 48 deletions examples/gl/glInfoExample/src/ofApp.cpp
View file
Open in desktop
Expand Up @@ -90,35 +90,36 @@ print_extension_list(char *ext)
static void
print_limits(void)
{

static const struct token_name openglLimits[] = {
{ 1, GL_MAX_ATTRIB_STACK_DEPTH, "GL_MAX_ATTRIB_STACK_DEPTH" },
{ 1, GL_MAX_CLIENT_ATTRIB_STACK_DEPTH, "GL_MAX_CLIENT_ATTRIB_STACK_DEPTH" },
{ 1, GL_MAX_CLIP_PLANES, "GL_MAX_CLIP_PLANES" },
{ 1, GL_MAX_COLOR_MATRIX_STACK_DEPTH, "GL_MAX_COLOR_MATRIX_STACK_DEPTH" },
#ifndef TARGET_EMSCRIPTEN
{ 1, GL_MAX_ATTRIB_STACK_DEPTH, "GL_MAX_ATTRIB_STACK_DEPTH" },
{ 1, GL_MAX_CLIENT_ATTRIB_STACK_DEPTH, "GL_MAX_CLIENT_ATTRIB_STACK_DEPTH" },
{ 1, GL_MAX_CLIP_PLANES, "GL_MAX_CLIP_PLANES" },
{ 1, GL_MAX_COLOR_MATRIX_STACK_DEPTH, "GL_MAX_COLOR_MATRIX_STACK_DEPTH" },
{ 1, GL_MAX_EVAL_ORDER, "GL_MAX_EVAL_ORDER" },
{ 1, GL_MAX_LIGHTS, "GL_MAX_LIGHTS" },
{ 1, GL_MAX_LIST_NESTING, "GL_MAX_LIST_NESTING" },
{ 1, GL_MAX_MODELVIEW_STACK_DEPTH, "GL_MAX_MODELVIEW_STACK_DEPTH" },
{ 1, GL_MAX_NAME_STACK_DEPTH, "GL_MAX_NAME_STACK_DEPTH" },
{ 1, GL_MAX_PIXEL_MAP_TABLE, "GL_MAX_PIXEL_MAP_TABLE" },
{ 1, GL_MAX_PROJECTION_STACK_DEPTH, "GL_MAX_PROJECTION_STACK_DEPTH" },
{ 1, GL_MAX_TEXTURE_STACK_DEPTH, "GL_MAX_TEXTURE_STACK_DEPTH" },
{ 1, GL_MAX_RECTANGLE_TEXTURE_SIZE_NV, "GL_MAX_RECTANGLE_TEXTURE_SIZE_NV" },
{ 1, GL_MAX_TEXTURE_UNITS_ARB, "GL_MAX_TEXTURE_UNITS_ARB" },
{ 2, GL_SMOOTH_LINE_WIDTH_RANGE, "GL_SMOOTH_LINE_WIDTH_RANGE" },
{ 2, GL_SMOOTH_POINT_SIZE_RANGE, "GL_SMOOTH_POINT_SIZE_RANGE" },
#endif
{ 1, GL_MAX_ELEMENTS_VERTICES, "GL_MAX_ELEMENTS_VERTICES" },
{ 1, GL_MAX_ELEMENTS_INDICES, "GL_MAX_ELEMENTS_INDICES" },
{ 1, GL_MAX_EVAL_ORDER, "GL_MAX_EVAL_ORDER" },
{ 1, GL_MAX_LIGHTS, "GL_MAX_LIGHTS" },
{ 1, GL_MAX_LIST_NESTING, "GL_MAX_LIST_NESTING" },
{ 1, GL_MAX_MODELVIEW_STACK_DEPTH, "GL_MAX_MODELVIEW_STACK_DEPTH" },
{ 1, GL_MAX_NAME_STACK_DEPTH, "GL_MAX_NAME_STACK_DEPTH" },
{ 1, GL_MAX_PIXEL_MAP_TABLE, "GL_MAX_PIXEL_MAP_TABLE" },
{ 1, GL_MAX_PROJECTION_STACK_DEPTH, "GL_MAX_PROJECTION_STACK_DEPTH" },
{ 1, GL_MAX_TEXTURE_STACK_DEPTH, "GL_MAX_TEXTURE_STACK_DEPTH" },
{ 1, GL_MAX_TEXTURE_SIZE, "GL_MAX_TEXTURE_SIZE" },
{ 1, GL_MAX_3D_TEXTURE_SIZE, "GL_MAX_3D_TEXTURE_SIZE" },
{ 1, GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB, "GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB" },
{ 1, GL_MAX_RECTANGLE_TEXTURE_SIZE_NV, "GL_MAX_RECTANGLE_TEXTURE_SIZE_NV" },
{ 1, GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB, "GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB" },
{ 1, GL_MAX_TEXTURE_UNITS_ARB, "GL_MAX_TEXTURE_UNITS_ARB" },
{ 1, GL_MAX_TEXTURE_LOD_BIAS_EXT, "GL_MAX_TEXTURE_LOD_BIAS_EXT" },
{ 1, GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, "GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT" },
{ 2, GL_MAX_VIEWPORT_DIMS, "GL_MAX_VIEWPORT_DIMS" },
{ 2, GL_ALIASED_LINE_WIDTH_RANGE, "GL_ALIASED_LINE_WIDTH_RANGE" },
{ 2, GL_SMOOTH_LINE_WIDTH_RANGE, "GL_SMOOTH_LINE_WIDTH_RANGE" },
{ 2, GL_ALIASED_POINT_SIZE_RANGE, "GL_ALIASED_POINT_SIZE_RANGE" },
{ 2, GL_SMOOTH_POINT_SIZE_RANGE, "GL_SMOOTH_POINT_SIZE_RANGE" },
{ 0, (GLenum) 0, NULL }
};
GLint i, max[2];
Expand All @@ -135,7 +136,6 @@ print_limits(void)
}

void printShaderLimits(){

static const struct token_name lll[] = {
{ 1, GL_MAX_VERTEX_ATTRIBS, "GL_MAX_VERTEX_ATTRIBS" },
{ 1, GL_MAX_VERTEX_UNIFORM_COMPONENTS, "GL_MAX_VERTEX_UNIFORM_COMPONENTS" },
Expand All @@ -160,7 +160,6 @@ void printShaderLimits(){


void printGLInfo(){

char *version = NULL;
char *vendor = NULL;
char *renderer = NULL;
Expand All @@ -173,14 +172,11 @@ void printGLInfo(){
renderer = (char*)glGetString(GL_RENDERER);

cout << "version=" << version << "\nvendor=" << vendor << "\nrenderer=" << renderer << "\n";

}


//--------------------------------------------------------------
void ofApp::setup(){


info.version = (char*)glGetString(GL_VERSION);
info.vendor = (char*)glGetString(GL_VENDOR);
info.renderer = (char*)glGetString(GL_RENDERER);
Expand All @@ -203,8 +199,9 @@ void ofApp::setup(){

glGetIntegerv(GL_MAX_TEXTURE_SIZE, &info.maxTextureSize);
glGetIntegerv(GL_MAX_VIEWPORT_DIMS, info.maxDimensions);
glGetIntegerv(GL_MAX_LIGHTS, &info.maxLights);

#ifndef TARGET_EMSCRIPTEN
glGetIntegerv(GL_MAX_LIGHTS, &info.maxLights);
#endif
}

//--------------------------------------------------------------
Expand All @@ -214,7 +211,6 @@ void ofApp::update(){

//--------------------------------------------------------------
void ofApp::draw(){

string output = "";

string pointSprites = ((info.bPointSpritesSupported == true) ? "yes" : "no");
Expand All @@ -238,24 +234,22 @@ void ofApp::draw(){

ofDrawBitmapStringHighlight(output, 20, 20);
ofDrawBitmapStringHighlight("press ' ' to load full report", 20, 220, ofColor::magenta, ofColor::white);

}

//--------------------------------------------------------------
void ofApp::keyPressed(int key){

if (key == ' '){

// todo: rewrite this with ofLog:

#ifndef TARGET_EMSCRIPTEN
FILE *fp;

FILE *fp;


if((fp=freopen(ofToDataPath("openglReport.txt").c_str(), "w" ,stdout))==NULL) {
cout << "Cannot open file.\n";
return;
}

if((fp=freopen(ofToDataPath("openglReport.txt").c_str(), "w" ,stdout))==NULL) {
cout << "Cannot open file.\n";
return;
}
#endif

cout << "-------------------------------------------------\n";
cout << "opengl info\n";
Expand Down Expand Up @@ -296,20 +290,22 @@ void ofApp::keyPressed(int key){


printGlewInfo();

fclose(fp);

#ifdef TARGET_WIN32
string command = "start " + ofToString(ofToDataPath("openglReport.txt").c_str());
#elif defined(TARGET_LINUX)
string command = "xdg-open " + ofToString(ofToDataPath("openglReport.txt").c_str());
#else
string command = "open " + ofToString(ofToDataPath("openglReport.txt").c_str());

#ifndef TARGET_EMSCRIPTEN
fclose(fp);

#ifdef TARGET_WIN32
string command = "start " + ofToString(ofToDataPath("openglReport.txt").c_str());
#elif defined(TARGET_LINUX)
string command = "xdg-open " + ofToString(ofToDataPath("openglReport.txt").c_str());
#else
string command = "open " + ofToString(ofToDataPath("openglReport.txt").c_str());
#endif

if (0 != system(command.c_str())){
ofLogWarning() << "Command " << command.c_str() << " did not return 0. Something may have gone wrong.";
}
#endif

if (0 != system(command.c_str())){
ofLogWarning() << "Command " << command.c_str() << " did not return 0. Something may have gone wrong.";
}
}
}

Expand Down