updated for vbo
This commit is contained in:
parent
da46353056
commit
bc18ac45a3
|
@ -53,7 +53,6 @@
|
||||||
#include "shader/shader_api.h"
|
#include "shader/shader_api.h"
|
||||||
#include "shader/prog_print.h"
|
#include "shader/prog_print.h"
|
||||||
#include "drivers/common/driverfuncs.h"
|
#include "drivers/common/driverfuncs.h"
|
||||||
#include "array_cache/acache.h"
|
|
||||||
#include "tnl/tnl.h"
|
#include "tnl/tnl.h"
|
||||||
#include "tnl/t_context.h"
|
#include "tnl/t_context.h"
|
||||||
#include "tnl/t_pipeline.h"
|
#include "tnl/t_pipeline.h"
|
||||||
|
@ -61,6 +60,7 @@
|
||||||
#include "swrast/s_context.h"
|
#include "swrast/s_context.h"
|
||||||
#include "swrast/s_triangle.h"
|
#include "swrast/s_triangle.h"
|
||||||
#include "swrast_setup/swrast_setup.h"
|
#include "swrast_setup/swrast_setup.h"
|
||||||
|
#include "vbo/vbo.h"
|
||||||
|
|
||||||
|
|
||||||
static const char *Prog = "glslcompiler";
|
static const char *Prog = "glslcompiler";
|
||||||
|
@ -96,8 +96,8 @@ UpdateState(GLcontext *ctx, GLuint new_state)
|
||||||
/* easy - just propogate */
|
/* easy - just propogate */
|
||||||
_swrast_InvalidateState( ctx, new_state );
|
_swrast_InvalidateState( ctx, new_state );
|
||||||
_swsetup_InvalidateState( ctx, new_state );
|
_swsetup_InvalidateState( ctx, new_state );
|
||||||
_ac_InvalidateState( ctx, new_state );
|
|
||||||
_tnl_InvalidateState( ctx, new_state );
|
_tnl_InvalidateState( ctx, new_state );
|
||||||
|
_vbo_InvalidateState( ctx, new_state );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -136,7 +136,7 @@ CreateContext(void)
|
||||||
_mesa_enable_sw_extensions(ctx);
|
_mesa_enable_sw_extensions(ctx);
|
||||||
|
|
||||||
if (!_swrast_CreateContext( ctx ) ||
|
if (!_swrast_CreateContext( ctx ) ||
|
||||||
!_ac_CreateContext( ctx ) ||
|
!_vbo_CreateContext( ctx ) ||
|
||||||
!_tnl_CreateContext( ctx ) ||
|
!_tnl_CreateContext( ctx ) ||
|
||||||
!_swsetup_CreateContext( ctx )) {
|
!_swsetup_CreateContext( ctx )) {
|
||||||
_mesa_destroy_visual(vis);
|
_mesa_destroy_visual(vis);
|
||||||
|
@ -277,6 +277,11 @@ ParseOptions(int argc, char *argv[])
|
||||||
Options.FragFile = NULL;
|
Options.FragFile = NULL;
|
||||||
Options.OutputFile = NULL;
|
Options.OutputFile = NULL;
|
||||||
|
|
||||||
|
if (argc == 1) {
|
||||||
|
Usage();
|
||||||
|
exit(0);
|
||||||
|
}
|
||||||
|
|
||||||
for (i = 1; i < argc; i++) {
|
for (i = 1; i < argc; i++) {
|
||||||
if (strcmp(argv[i], "--vs") == 0) {
|
if (strcmp(argv[i], "--vs") == 0) {
|
||||||
Options.VertFile = argv[i + 1];
|
Options.VertFile = argv[i + 1];
|
||||||
|
|
Loading…
Reference in New Issue