Changeset 2082
- Timestamp:
- Nov 17, 2012, 2:24:47 PM (10 years ago)
- Location:
- trunk/src/gpu
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/gpu/vertexbuffer.cpp
r2030 r2082 157 157 } 158 158 #else 159 /* FIXME: this has nothing to do here! */ 159 160 glFrontFace(GL_CCW); 160 161 glEnable(GL_CULL_FACE); 161 # if defined HAVE_GL_2X && !defined __APPLE__162 /* FIXME: this has nothing to do here! */163 glEnable(GL_ALPHA_TEST);164 glAlphaFunc(GL_GEQUAL, 0.01f);165 # endif166 162 glEnable(GL_BLEND); 167 163 glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); … … 182 178 break; 183 179 } 184 # if defined HAVE_GL_2X && !defined __APPLE__185 /* FIXME: this has nothing to do here! */186 glDisable(GL_ALPHA_TEST);187 # endif188 180 #endif 189 181 } … … 229 221 } 230 222 #else 223 /* FIXME: this has nothing to do here! */ 231 224 glFrontFace(GL_CCW); 232 225 glEnable(GL_CULL_FACE); 233 # if defined HAVE_GL_2X && !defined __APPLE__234 /* FIXME: this has nothing to do here! */235 glEnable(GL_ALPHA_TEST);236 glAlphaFunc(GL_GEQUAL, 0.01f);237 # endif238 226 glEnable(GL_BLEND); 239 227 glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); … … 262 250 break; 263 251 } 264 # if defined HAVE_GL_2X && !defined __APPLE__265 /* FIXME: this has nothing to do here! */266 glDisable(GL_ALPHA_TEST);267 # endif268 252 #endif 269 253 } … … 295 279 } 296 280 glBindBuffer(GL_ARRAY_BUFFER, 0); 297 /* FIXME: only useful for VAOs? */298 //glBindBuffer(GL_ARRAY_BUFFER, 0);299 281 #else 300 282 /* Or even: */ -
trunk/src/gpu/vertexbuffer.h
r1963 r2082 172 172 { 173 173 public: 174 VertexDeclaration(VertexStreamBase const &s1 ,174 VertexDeclaration(VertexStreamBase const &s1 = VertexStreamBase::Empty, 175 175 VertexStreamBase const &s2 = VertexStreamBase::Empty, 176 176 VertexStreamBase const &s3 = VertexStreamBase::Empty,
Note: See TracChangeset
for help on using the changeset viewer.