Reviewed-by: Roland Scheidegger <sroland@vmware.com>tags/18.1-branchpoint
| @@ -154,7 +154,7 @@ vbo_draw_method(struct vbo_context *vbo, gl_draw_method method) | |||
| ctx->Array._DrawArrays = vbo->save.inputs; | |||
| break; | |||
| default: | |||
| assert(0); | |||
| unreachable("Bad VBO drawing method"); | |||
| } | |||
| ctx->NewDriverState |= ctx->DriverFlags.NewArray; | |||
| @@ -178,7 +178,7 @@ vbo_attrtype_to_integer_flag(GLenum format) | |||
| case GL_UNSIGNED_INT64_ARB: | |||
| return GL_TRUE; | |||
| default: | |||
| assert(0); | |||
| unreachable("Bad vertex attribute type"); | |||
| return GL_FALSE; | |||
| } | |||
| } | |||
| @@ -195,7 +195,7 @@ vbo_attrtype_to_double_flag(GLenum format) | |||
| case GL_DOUBLE: | |||
| return GL_TRUE; | |||
| default: | |||
| assert(0); | |||
| unreachable("Bad vertex attribute type"); | |||
| return GL_FALSE; | |||
| } | |||
| } | |||
| @@ -218,7 +218,7 @@ vbo_get_default_vals_as_union(GLenum format) | |||
| case GL_UNSIGNED_INT: | |||
| return (fi_type *)default_int; | |||
| default: | |||
| assert(0); | |||
| unreachable("Bad vertex format"); | |||
| return NULL; | |||
| } | |||
| } | |||
| @@ -150,7 +150,7 @@ check_draw_elements_data(struct gl_context *ctx, GLsizei count, | |||
| j = ((const GLuint *) elements)[i]; | |||
| break; | |||
| default: | |||
| assert(0); | |||
| unreachable("Unexpected index buffer type"); | |||
| } | |||
| /* check element j of each enabled array */ | |||
| @@ -159,7 +159,7 @@ vbo_copy_vertices(struct vbo_exec_context *exec) | |||
| case PRIM_OUTSIDE_BEGIN_END: | |||
| return 0; | |||
| default: | |||
| assert(0); | |||
| unreachable("Unexpected primitive type"); | |||
| return 0; | |||
| } | |||
| } | |||
| @@ -220,7 +220,7 @@ vbo_exec_bind_arrays(struct gl_context *ctx) | |||
| } | |||
| break; | |||
| default: | |||
| assert(0); | |||
| unreachable("Bad vertex program mode"); | |||
| } | |||
| for (attr = 0; attr < VERT_ATTRIB_MAX ; attr++) { | |||
| @@ -174,7 +174,7 @@ copy_vertices(struct gl_context *ctx, | |||
| sz * sizeof(GLfloat)); | |||
| return i; | |||
| default: | |||
| assert(0); | |||
| unreachable("Unexpected primitive type"); | |||
| return 0; | |||
| } | |||
| } | |||
| @@ -675,8 +675,7 @@ copy_from_current(struct gl_context *ctx) | |||
| save->attrptr[i][0] = save->current[i][0]; | |||
| break; | |||
| case 0: | |||
| assert(0); | |||
| break; | |||
| unreachable("Unexpected vertex attribute size"); | |||
| } | |||
| } | |||
| } | |||
| @@ -194,7 +194,7 @@ bind_vertex_list(struct gl_context *ctx, | |||
| } | |||
| break; | |||
| default: | |||
| assert(0); | |||
| unreachable("Bad vertex program mode"); | |||
| } | |||
| for (attr = 0; attr < VERT_ATTRIB_MAX; attr++) { | |||