Remove the object index attribute from the shaders, since it's now unused
This commit is contained in:
parent
86f5bdb44a
commit
25a6c33a1a
|
@ -995,7 +995,6 @@ where
|
||||||
let tess_coord_attr = device.get_vertex_attr(&alpha_tile_program.program, "TessCoord");
|
let tess_coord_attr = device.get_vertex_attr(&alpha_tile_program.program, "TessCoord");
|
||||||
let tile_origin_attr = device.get_vertex_attr(&alpha_tile_program.program, "TileOrigin");
|
let tile_origin_attr = device.get_vertex_attr(&alpha_tile_program.program, "TileOrigin");
|
||||||
let backdrop_attr = device.get_vertex_attr(&alpha_tile_program.program, "Backdrop");
|
let backdrop_attr = device.get_vertex_attr(&alpha_tile_program.program, "Backdrop");
|
||||||
let object_attr = device.get_vertex_attr(&alpha_tile_program.program, "Object");
|
|
||||||
let tile_index_attr = device.get_vertex_attr(&alpha_tile_program.program, "TileIndex");
|
let tile_index_attr = device.get_vertex_attr(&alpha_tile_program.program, "TileIndex");
|
||||||
let color_tex_coord_attr = device.get_vertex_attr(&alpha_tile_program.program,
|
let color_tex_coord_attr = device.get_vertex_attr(&alpha_tile_program.program,
|
||||||
"ColorTexCoord");
|
"ColorTexCoord");
|
||||||
|
@ -1030,14 +1029,6 @@ where
|
||||||
offset: 3,
|
offset: 3,
|
||||||
divisor: 1,
|
divisor: 1,
|
||||||
});
|
});
|
||||||
device.configure_vertex_attr(&object_attr, &VertexAttrDescriptor {
|
|
||||||
size: 1,
|
|
||||||
class: VertexAttrClass::Int,
|
|
||||||
attr_type: VertexAttrType::I16,
|
|
||||||
stride: MASK_TILE_INSTANCE_SIZE,
|
|
||||||
offset: 4,
|
|
||||||
divisor: 1,
|
|
||||||
});
|
|
||||||
device.configure_vertex_attr(&tile_index_attr, &VertexAttrDescriptor {
|
device.configure_vertex_attr(&tile_index_attr, &VertexAttrDescriptor {
|
||||||
size: 1,
|
size: 1,
|
||||||
class: VertexAttrClass::Int,
|
class: VertexAttrClass::Int,
|
||||||
|
@ -1080,7 +1071,6 @@ where
|
||||||
|
|
||||||
let tess_coord_attr = device.get_vertex_attr(&solid_tile_program.program, "TessCoord");
|
let tess_coord_attr = device.get_vertex_attr(&solid_tile_program.program, "TessCoord");
|
||||||
let tile_origin_attr = device.get_vertex_attr(&solid_tile_program.program, "TileOrigin");
|
let tile_origin_attr = device.get_vertex_attr(&solid_tile_program.program, "TileOrigin");
|
||||||
let object_attr = device.get_vertex_attr(&solid_tile_program.program, "Object");
|
|
||||||
let color_tex_coord_attr = device.get_vertex_attr(&solid_tile_program.program,
|
let color_tex_coord_attr = device.get_vertex_attr(&solid_tile_program.program,
|
||||||
"ColorTexCoord");
|
"ColorTexCoord");
|
||||||
|
|
||||||
|
@ -1114,14 +1104,6 @@ where
|
||||||
offset: 4,
|
offset: 4,
|
||||||
divisor: 1,
|
divisor: 1,
|
||||||
});
|
});
|
||||||
device.configure_vertex_attr(&object_attr, &VertexAttrDescriptor {
|
|
||||||
size: 1,
|
|
||||||
class: VertexAttrClass::Int,
|
|
||||||
attr_type: VertexAttrType::I16,
|
|
||||||
stride: SOLID_TILE_INSTANCE_SIZE,
|
|
||||||
offset: 8,
|
|
||||||
divisor: 1,
|
|
||||||
});
|
|
||||||
|
|
||||||
SolidTileVertexArray { vertex_array, vertex_buffer }
|
SolidTileVertexArray { vertex_array, vertex_buffer }
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,7 +16,6 @@ uniform vec2 uViewBoxOrigin;
|
||||||
in vec2 aTessCoord;
|
in vec2 aTessCoord;
|
||||||
in uvec3 aTileOrigin;
|
in uvec3 aTileOrigin;
|
||||||
in int aBackdrop;
|
in int aBackdrop;
|
||||||
in uint aObject;
|
|
||||||
in uint aTileIndex;
|
in uint aTileIndex;
|
||||||
|
|
||||||
out vec2 vTexCoord;
|
out vec2 vTexCoord;
|
||||||
|
|
|
@ -14,7 +14,6 @@ uniform vec2 uViewBoxOrigin;
|
||||||
|
|
||||||
in vec2 aTessCoord;
|
in vec2 aTessCoord;
|
||||||
in vec2 aTileOrigin;
|
in vec2 aTileOrigin;
|
||||||
in uint aObject;
|
|
||||||
|
|
||||||
out vec4 vColor;
|
out vec4 vColor;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue