Mike-Solar
eb634b53ef
R7-A (Qwen 3.8 Max): oakengine/display.h rewritten to the POD contract from r7-pure-abi-plan.md - oak_video_params everywhere, opaque texture/frame handles with retain/free protocol (engine-heap control blocks), OakSharedBuffer refcounted wrapper for the QVariant playback path. All TexturePtr/FramePtr gone from app (47 sites). R7-B (Qwen 3.8 Max): liboakengine.so exports 3486 -> 19 C++ symbols (version script oakengine.ver: oakengine_* plus the documented oakgl/oakvulkan dlopen plugin ABI). oakengine-obj OBJECT library feeds both the shared lib and the test binaries (-rdynamic so dlopen'd backends resolve engine objects). Fix (Kimi K3): producer/consumer type mismatch - viewerdisplay unpacks OakSharedBufferPtr but viewer.cpp pushed raw void* handles, so no frame ever reached the display widget (all 5 vulkan viewer tests timed out with 'never received a texture'). Producers now wrap with oak_make_shared_frame / oak_make_shared_texture(retain). Verified: build 0 errors, ctest 45/45, nm U _ZN5olive = 0 in oak-editor/oak-render-worker/oak-cli, 19 exported C++ symbols in liboakengine.so (all documented plugin ABI).
96 lines
2.2 KiB
C++
96 lines
2.2 KiB
C++
/***
|
|
|
|
Olive - Non-Linear Video Editor
|
|
Copyright (C) 2022 Olive Team
|
|
Modifications Copyright (C) 2025 mikesolar
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
***/
|
|
|
|
#ifndef OAK_SCOPEBASE_H
|
|
#define OAK_SCOPEBASE_H
|
|
|
|
#include <QString>
|
|
|
|
#include "widget/manageddisplay/manageddisplay.h"
|
|
|
|
namespace olive
|
|
{
|
|
|
|
/** @brief Fragment + vertex shader source pair returned by scope subclasses. */
|
|
struct ScopeShaderCode {
|
|
QString frag;
|
|
QString vert;
|
|
};
|
|
|
|
class ScopeBase : public ManagedDisplayWidget {
|
|
public:
|
|
ScopeBase(QWidget *parent = nullptr);
|
|
|
|
MANAGEDDISPLAYWIDGET_DEFAULT_DESTRUCTOR(ScopeBase)
|
|
|
|
public slots:
|
|
void set_buffer(void *frame);
|
|
|
|
protected slots:
|
|
virtual void on_init() override;
|
|
|
|
virtual void on_paint() override;
|
|
|
|
virtual void on_destroy() override;
|
|
|
|
protected:
|
|
virtual void showEvent(QShowEvent *e) override;
|
|
|
|
virtual ScopeShaderCode generate_shader_code() = 0;
|
|
|
|
/**
|
|
* @brief GPU-accelerated draw function used on OpenGL backends.
|
|
*
|
|
* Override this if your sub-class scope needs extra drawing.
|
|
*/
|
|
virtual void draw_scope(void *managed_tex, void *pipeline);
|
|
|
|
/**
|
|
* @brief Software draw function used on backend-neutral paths (e.g. Vulkan).
|
|
*
|
|
* Implementations receive an 8-bit sRGB/display-ready image and should draw
|
|
* the scope visualization with QPainter.
|
|
*/
|
|
virtual void draw_scope_software(QPainter &p, const QImage &image) = 0;
|
|
|
|
private:
|
|
void update_software_image();
|
|
|
|
void *pipeline_;
|
|
|
|
void *texture_;
|
|
|
|
void *managed_tex_;
|
|
|
|
bool managed_tex_up_to_date_;
|
|
|
|
void *software_tex_;
|
|
QByteArray software_buffer_;
|
|
QImage software_image_;
|
|
bool software_image_up_to_date_;
|
|
|
|
void *local_texture_;
|
|
};
|
|
|
|
}
|
|
|
|
#endif // OAK_SCOPEBASE_H
|