X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fvertexarray.cpp;h=5674bbe0ddda48472cc0423b5230fe754710b3fc;hp=72fd8a48ecddc802ec6a1bd0aa2cb985e3c9328a;hb=97b8f0d945474582c2213b70418d399e5641f0d5;hpb=61ff840cd211f10d45dca8c4dad2cca5f68aaa42 diff --git a/source/vertexarray.cpp b/source/vertexarray.cpp index 72fd8a48..5674bbe0 100644 --- a/source/vertexarray.cpp +++ b/source/vertexarray.cpp @@ -1,5 +1,6 @@ #include #include +#include #include "buffer.h" #include "error.h" #include "gl.h" @@ -11,6 +12,8 @@ using namespace std; namespace Msp { namespace GL { +bool VertexArray::legacy_used = false; + VertexArray::VertexArray(const VertexFormat &f) { reset(f); @@ -18,13 +21,10 @@ VertexArray::VertexArray(const VertexFormat &f) VertexArray::~VertexArray() { + /* Unbind accesses the current VertexArray, so a call from ~Bindable would + try to access destroyed data. */ if(current()==this) - { - /* We must deactivate arrays here, or apply() would try to access deleted - data on the next invocation. */ - set_current(0); - apply_arrays(0, &arrays, 0, 0); - } + unbind(); } void VertexArray::reset(const VertexFormat &f) @@ -32,6 +32,7 @@ void VertexArray::reset(const VertexFormat &f) clear(); format = f; stride = get_stride(format); + legacy = false; arrays.clear(); @@ -46,6 +47,9 @@ void VertexArray::reset(const VertexFormat &f) arr.component = *c; arr.offset = offs; + if(*csub_data(get_offset(), get_data_size(), &data[0]); -} - -void VertexArray::apply() const +void VertexArray::apply(bool use_legacy) const { if(format.empty()) throw invalid_operation("VertexArray::apply"); @@ -116,6 +116,17 @@ void VertexArray::apply() const if(Mesh::current()) throw invalid_operation("VertexArray::apply"); + /* Unbind first if the legacy flag changes. The logic for supporting it + directly in apply_arrays would get too complicated, and this also allows + rebinding the same array with different legacy setting. */ + if(legacy_used!=use_legacy) + unbind(); + + if(!use_legacy) + static Require _req(ARB_vertex_shader); + else if(legacy) + static Require _req(MSP_legacy_features); + const VertexArray *old = current(); /* If the array has been modified, apply it even if it was the last one to be applied. This is necessary to get the data updated to vertex buffer, and @@ -131,10 +142,10 @@ void VertexArray::apply() const const float *base = (vbuf ? reinterpret_cast(get_offset()) : &data[0]); unsigned stride_bytes = stride*sizeof(float); - apply_arrays(&arrays, (old ? &old->arrays : 0), base, stride_bytes); + apply_arrays(&arrays, (old ? &old->arrays : 0), base, stride_bytes, use_legacy); } -void VertexArray::apply_arrays(const vector *arrays, const vector *old_arrays, const float *base, unsigned stride_bytes) +void VertexArray::apply_arrays(const vector *arrays, const vector *old_arrays, const float *base, unsigned stride_bytes, bool use_legacy) { unsigned active_tex = 0; unsigned n_arrays = arrays ? arrays->size() : 0; @@ -150,69 +161,85 @@ void VertexArray::apply_arrays(const vector *arrays, const vector unsigned char comp = (arr ? arr->component : old_arr->component); unsigned sz = get_component_size(comp); unsigned t = get_component_type(comp); - GLenum array_type = 0; - if(t==get_component_type(VERTEX3)) + if(use_legacy) { - if(arr) - glVertexPointer(sz, GL_FLOAT, stride_bytes, base+arr->offset); - array_type = GL_VERTEX_ARRAY; - } - else if(t==get_component_type(NORMAL3)) - { - if(arr) - glNormalPointer(GL_FLOAT, stride_bytes, base+arr->offset); - array_type = GL_NORMAL_ARRAY; - } - else if(t==get_component_type(COLOR4_FLOAT)) - { - if(arr) + GLenum array_type = 0; + if(t==get_component_type(VERTEX3)) { - if(sz==1) - glColorPointer(4, GL_UNSIGNED_BYTE, stride_bytes, base+arr->offset); - else - glColorPointer(sz, GL_FLOAT, stride_bytes, base+arr->offset); + if(arr) + glVertexPointer(sz, GL_FLOAT, stride_bytes, base+arr->offset); + array_type = GL_VERTEX_ARRAY; } - array_type = GL_COLOR_ARRAY; - } - else if(comp>=TEXCOORD1 && comp<=TEXCOORD4+12) - { - t -= get_component_type(TEXCOORD1); - if(t>0 || active_tex) + else if(t==get_component_type(NORMAL3)) { - glClientActiveTexture(GL_TEXTURE0+t); - active_tex = t; + if(arr) + glNormalPointer(GL_FLOAT, stride_bytes, base+arr->offset); + array_type = GL_NORMAL_ARRAY; + } + else if(t==get_component_type(COLOR4_FLOAT)) + { + if(arr) + { + if(sz==1) + glColorPointer(4, GL_UNSIGNED_BYTE, stride_bytes, base+arr->offset); + else + glColorPointer(sz, GL_FLOAT, stride_bytes, base+arr->offset); + } + array_type = GL_COLOR_ARRAY; + } + else if(comp>=TEXCOORD1 && comp<=TEXCOORD4+12) + { + t -= get_component_type(TEXCOORD1); + if(t>0 || active_tex) + { + glClientActiveTexture(GL_TEXTURE0+t); + active_tex = t; + } + if(arr) + glTexCoordPointer(sz, GL_FLOAT, stride_bytes, base+arr->offset); + array_type = GL_TEXTURE_COORD_ARRAY; + } + + if(array_type) + { + // Only change enable state if needed + if(arr && !old_arr) + glEnableClientState(array_type); + else if(old_arr && !arr) + glDisableClientState(array_type); + + continue; } - if(arr) - glTexCoordPointer(sz, GL_FLOAT, stride_bytes, base+arr->offset); - array_type = GL_TEXTURE_COORD_ARRAY; } - else + + if(t>=get_component_type(ATTRIB1)) + t -= get_component_type(ATTRIB1); + if(arr) { - if(t>=get_component_type(ATTRIB1)) - t -= get_component_type(ATTRIB1); - if(arr) + if(arr->component==COLOR4_UBYTE) + glVertexAttribPointer(t, 4, GL_UNSIGNED_BYTE, true, stride_bytes, base+arr->offset); + else glVertexAttribPointer(t, sz, GL_FLOAT, false, stride_bytes, base+arr->offset); } // Only change enable state if needed if(arr && !old_arr) - { - if(array_type) - glEnableClientState(array_type); - else - glEnableVertexAttribArray(t); - } + glEnableVertexAttribArray(t); else if(old_arr && !arr) - { - if(array_type) - glDisableClientState(array_type); - else - glDisableVertexAttribArray(t); - } + glDisableVertexAttribArray(t); } if(active_tex) glClientActiveTexture(GL_TEXTURE0); + + legacy_used = use_legacy; +} + +void VertexArray::unbind() +{ + const VertexArray *old = current(); + if(set_current(0)) + apply_arrays(0, &old->arrays, 0, 0, legacy_used); }