X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fhypertorus.c;fp=hacks%2Fglx%2Fhypertorus.c;h=908f612e266a8002114d52aeb95ee4420acf7ff7;hp=f957f5d28249154fff4d16334ce135cb01731972;hb=b81f521c5ad7022ac12db18ca8fcdd9fb063831e;hpb=c141c2b05e374757b6499d12bb8a6d4d943b1529 diff --git a/hacks/glx/hypertorus.c b/hacks/glx/hypertorus.c index f957f5d2..908f612e 100644 --- a/hacks/glx/hypertorus.c +++ b/hacks/glx/hypertorus.c @@ -631,16 +631,12 @@ static void init(ModeInfo *mi) glMatrixMode(GL_MODELVIEW); glLoadIdentity(); +# ifdef HAVE_JWZGLES /* #### glPolygonMode other than GL_FILL unimplemented */ if (display_mode == DISP_WIREFRAME) - { - glDisable(GL_DEPTH_TEST); - glShadeModel(GL_FLAT); - glPolygonMode(GL_FRONT_AND_BACK,GL_LINE); - glDisable(GL_LIGHTING); - glDisable(GL_LIGHT0); - glDisable(GL_BLEND); - } - else if (display_mode == DISP_SURFACE) + display_mode = DISP_SURFACE; +# endif + + if (display_mode == DISP_SURFACE) { glEnable(GL_DEPTH_TEST); glDepthFunc(GL_LESS); @@ -676,7 +672,7 @@ static void init(ModeInfo *mi) glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA,GL_ONE); } - else + else /* display_mode == DISP_WIREFRAME */ { glDisable(GL_DEPTH_TEST); glShadeModel(GL_FLAT);